# HG changeset patch # User Christophe Lincoln # Date 1489137119 -3600 # Node ID 9ff1a3400fb141aee683fbfa391c62b65dd2fd2d # Parent 36795f3c1ef3fa05e0435ca6e3e0139b998d9bff Improve package info diff -r 36795f3c1ef3 -r 9ff1a3400fb1 README --- a/README Fri Mar 10 09:12:43 2017 +0100 +++ b/README Fri Mar 10 10:11:59 2017 +0100 @@ -151,7 +151,7 @@ [036/36] Cyan for installed/mirror [035/35] Magenta for cook/wok - [033/33] Yellow for commands/functions + [033/33] Yellow for commands/functions/info() The CGI/Web hug services match SCN/SliTaz network graphical style. diff -r 36795f3c1ef3 -r 9ff1a3400fb1 po/clients/fr.po --- a/po/clients/fr.po Fri Mar 10 09:12:43 2017 +0100 +++ b/po/clients/fr.po Fri Mar 10 10:11:59 2017 +0100 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: Sup Clients\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-03-10 09:11+0100\n" +"POT-Creation-Date: 2017-03-10 10:11+0100\n" "PO-Revision-Date: 2017-02-26 21:15+0100\n" "Last-Translator: Christophe Lincoln \n" "Language-Team: French\n" @@ -97,182 +97,196 @@ msgstr "" #: sup:49 +#, fuzzy +msgid "List installed files by a package" +msgstr "Paquet installé:" + +#: sup:50 msgid "Display more output messages" msgstr "" -#: sup:68 +#: sup:69 msgid "Missing package name or file path:" msgstr "" -#: sup:112 +#: sup:113 msgid "Initializing sup cook environment..." msgstr "" -#: sup:119 sup:184 +#: sup:120 sup:185 msgid "Can't find receip in wok for:" msgstr "" -#: sup:123 +#: sup:124 msgid "Building package:" msgstr "" -#: sup:129 +#: sup:130 msgid "Checking receip variables..." msgstr "" -#: sup:137 sup:142 +#: sup:138 sup:143 msgid "Empty variable:" msgstr "" -#: sup:143 +#: sup:144 msgid "You can use:" msgstr "" -#: sup:165 +#: sup:166 msgid "Creating compressed archive..." msgstr "" -#: sup:172 sup:241 +#: sup:173 sup:242 msgid "Packages:" msgstr "" -#: sup:188 +#: sup:189 msgid "Running" msgstr "" -#: sup:193 libsup.sh:120 +#: sup:194 libsup.sh:120 msgid "Checking package dependencies" msgstr "" -#: sup:200 +#: sup:201 msgid "Working folder:" msgstr "" -#: sup:207 +#: sup:208 msgid "New package name:" msgstr "" -#: sup:213 +#: sup:214 msgid "Package already exists in wok:" msgstr "" -#: sup:216 +#: sup:217 msgid "Creating new package files and tree..." msgstr "" -#: sup:219 +#: sup:220 msgid "Executing your favorite editor..." msgstr "" -#: sup:221 +#: sup:222 msgid "To cook your package:" msgstr "" -#: sup:231 +#: sup:232 msgid "Can't find package file:" msgstr "" -#: sup:235 +#: sup:236 msgid "Extract package:" msgstr "" -#: sup:275 +#: sup:276 msgid "Can't find sup package:" msgstr "" -#: sup:281 +#: sup:282 msgid "SUP Update" msgstr "" -#: sup:286 +#: sup:287 msgid "Mirror is unreachable" msgstr "" -#: sup:292 +#: sup:293 msgid "Checking packages.sql..." msgstr "" -#: sup:311 +#: sup:312 msgid "Database timestamp:" msgstr "" -#: sup:313 +#: sup:314 msgid "Updated packages database:" msgstr "" -#: sup:318 +#: sup:319 msgid "Please try later. Missing packages database" msgstr "" -#: sup:326 +#: sup:327 #, fuzzy msgid "Installed packages:" msgstr "Paquet installé:" -#: sup:328 +#: sup:329 msgid "Package" msgstr "" -#: sup:328 +#: sup:329 msgid "Version" msgstr "" -#: sup:329 +#: sup:330 msgid "Status" msgstr "" -#: sup:355 +#: sup:356 msgid "rebuilt" msgstr "" -#: sup:366 +#: sup:367 msgid "Available updates:" msgstr "" -#: sup:375 +#: sup:376 msgid "Packages are up-to-date" msgstr "" -#: sup:387 sup:476 +#: sup:388 sup:485 msgid "Can't find installed package:" msgstr "" -#: sup:395 +#: sup:396 msgid "Searching for:" msgstr "" -#: sup:409 sup:446 +#: sup:410 sup:447 msgid "SUP packages in database:" msgstr "" -#: sup:421 +#: sup:422 #, fuzzy msgid "Installed SUP packages:" msgstr "Paquet installé:" -#: sup:429 +#: sup:430 msgid "No sup packages installed" msgstr "" -#: sup:433 +#: sup:434 #, fuzzy msgid "SUP packages in your wok:" msgstr "Paquet installé:" -#: sup:443 sup:453 +#: sup:444 sup:454 #, fuzzy msgid "Cooked packages:" msgstr "Paquet installé:" -#: sup:456 +#: sup:457 msgid "Downloads::" msgstr "" -#: sup:468 +#: sup:470 msgid "Installed package:" msgstr "Paquet installé:" -#: sup:472 +#: sup:475 +msgid "Files list:" +msgstr "" + +#: sup:479 +#, fuzzy +msgid "Installed size:" +msgstr "Fichers installés:" + +#: sup:481 msgid "Installed files:" msgstr "Fichers installés:" diff -r 36795f3c1ef3 -r 9ff1a3400fb1 po/clients/ru.po --- a/po/clients/ru.po Fri Mar 10 09:12:43 2017 +0100 +++ b/po/clients/ru.po Fri Mar 10 10:11:59 2017 +0100 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: SUP Clients\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-03-10 09:12+0100\n" +"POT-Creation-Date: 2017-03-10 10:11+0100\n" "PO-Revision-Date: 2017-02-28 22:56+0200\n" "Last-Translator: Aleksej Bobylev \n" "Language-Team: \n" @@ -99,188 +99,202 @@ msgstr "Инициализировать среду sup cook" #: sup:49 +#, fuzzy +msgid "List installed files by a package" +msgstr "Установленный пакет:" + +#: sup:50 msgid "Display more output messages" msgstr "Показывать больше выходных сообщений" -#: sup:68 +#: sup:69 msgid "Missing package name or file path:" msgstr "Отсутствует название пакета или путь к файлу:" -#: sup:112 +#: sup:113 msgid "Initializing sup cook environment..." msgstr "Инициализация среды sup cook…" -#: sup:119 sup:184 +#: sup:120 sup:185 msgid "Can't find receip in wok for:" msgstr "Не удалось найти receip в wok для:" -#: sup:123 +#: sup:124 msgid "Building package:" msgstr "Создание пакета:" -#: sup:129 +#: sup:130 msgid "Checking receip variables..." msgstr "Проверка переменных receip…" -#: sup:137 sup:142 +#: sup:138 sup:143 msgid "Empty variable:" msgstr "Пустая переменная:" -#: sup:143 +#: sup:144 msgid "You can use:" msgstr "Вы можете использовать:" -#: sup:165 +#: sup:166 msgid "Creating compressed archive..." msgstr "Создание сжатого архива…" -#: sup:172 sup:241 +#: sup:173 sup:242 msgid "Packages:" msgstr "Пакеты:" -#: sup:188 +#: sup:189 msgid "Running" msgstr "" -#: sup:193 libsup.sh:120 +#: sup:194 libsup.sh:120 #, fuzzy msgid "Checking package dependencies" msgstr "Проверка зависимостей для" -#: sup:200 +#: sup:201 #, fuzzy msgid "Working folder:" msgstr "Удаление папки:" -#: sup:207 +#: sup:208 msgid "New package name:" msgstr "Название нового пакета:" -#: sup:213 +#: sup:214 msgid "Package already exists in wok:" msgstr "Пакет уже существует в wok:" -#: sup:216 +#: sup:217 msgid "Creating new package files and tree..." msgstr "Создание файлов и дерева нового пакета…" -#: sup:219 +#: sup:220 msgid "Executing your favorite editor..." msgstr "Запуск вашего любимого редактора…" -#: sup:221 +#: sup:222 msgid "To cook your package:" msgstr "Чтобы создать ваш пакет:" -#: sup:231 +#: sup:232 msgid "Can't find package file:" msgstr "Не удалось найти файл пакета:" -#: sup:235 +#: sup:236 msgid "Extract package:" msgstr "Распаковка пакета:" -#: sup:275 +#: sup:276 msgid "Can't find sup package:" msgstr "Не удалось найти пакет sup:" -#: sup:281 +#: sup:282 msgid "SUP Update" msgstr "Обновление SUP" -#: sup:286 +#: sup:287 msgid "Mirror is unreachable" msgstr "Зеркало недоступно" -#: sup:292 +#: sup:293 #, fuzzy msgid "Checking packages.sql..." msgstr "Проверка переменных receip…" -#: sup:311 +#: sup:312 msgid "Database timestamp:" msgstr "" -#: sup:313 +#: sup:314 #, fuzzy msgid "Updated packages database:" msgstr "Название нового пакета:" -#: sup:318 +#: sup:319 msgid "Please try later. Missing packages database" msgstr "" -#: sup:326 +#: sup:327 #, fuzzy msgid "Installed packages:" msgstr "Установленный пакет:" -#: sup:328 +#: sup:329 #, fuzzy msgid "Package" msgstr "Пакеты:" -#: sup:328 +#: sup:329 msgid "Version" msgstr "" -#: sup:329 +#: sup:330 msgid "Status" msgstr "" -#: sup:355 +#: sup:356 msgid "rebuilt" msgstr "" -#: sup:366 +#: sup:367 msgid "Available updates:" msgstr "" -#: sup:375 +#: sup:376 msgid "Packages are up-to-date" msgstr "" -#: sup:387 sup:476 +#: sup:388 sup:485 msgid "Can't find installed package:" msgstr "Не удалось найти установленный пакет:" -#: sup:395 +#: sup:396 msgid "Searching for:" msgstr "" -#: sup:409 sup:446 +#: sup:410 sup:447 #, fuzzy msgid "SUP packages in database:" msgstr "Название нового пакета:" -#: sup:421 +#: sup:422 #, fuzzy msgid "Installed SUP packages:" msgstr "Установленный пакет:" -#: sup:429 +#: sup:430 msgid "No sup packages installed" msgstr "Нет установленных пакетов sup" -#: sup:433 +#: sup:434 #, fuzzy msgid "SUP packages in your wok:" msgstr "Пакеты sup в вашем wok:" -#: sup:443 sup:453 +#: sup:444 sup:454 #, fuzzy msgid "Cooked packages:" msgstr "Чтобы создать ваш пакет:" -#: sup:456 +#: sup:457 msgid "Downloads::" msgstr "" -#: sup:468 +#: sup:470 msgid "Installed package:" msgstr "Установленный пакет:" -#: sup:472 +#: sup:475 +msgid "Files list:" +msgstr "" + +#: sup:479 +#, fuzzy +msgid "Installed size:" +msgstr "Установленные файлы:" + +#: sup:481 msgid "Installed files:" msgstr "Установленные файлы:" diff -r 36795f3c1ef3 -r 9ff1a3400fb1 po/clients/sup-clients.pot --- a/po/clients/sup-clients.pot Fri Mar 10 09:12:43 2017 +0100 +++ b/po/clients/sup-clients.pot Fri Mar 10 10:11:59 2017 +0100 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: SUP Clients\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-03-10 09:12+0100\n" +"POT-Creation-Date: 2017-03-10 10:11+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -90,178 +90,190 @@ msgstr "" #: sup:49 +msgid "List installed files by a package" +msgstr "" + +#: sup:50 msgid "Display more output messages" msgstr "" -#: sup:68 +#: sup:69 msgid "Missing package name or file path:" msgstr "" -#: sup:112 +#: sup:113 msgid "Initializing sup cook environment..." msgstr "" -#: sup:119 sup:184 +#: sup:120 sup:185 msgid "Can't find receip in wok for:" msgstr "" -#: sup:123 +#: sup:124 msgid "Building package:" msgstr "" -#: sup:129 +#: sup:130 msgid "Checking receip variables..." msgstr "" -#: sup:137 sup:142 +#: sup:138 sup:143 msgid "Empty variable:" msgstr "" -#: sup:143 +#: sup:144 msgid "You can use:" msgstr "" -#: sup:165 +#: sup:166 msgid "Creating compressed archive..." msgstr "" -#: sup:172 sup:241 +#: sup:173 sup:242 msgid "Packages:" msgstr "" -#: sup:188 +#: sup:189 msgid "Running" msgstr "" -#: sup:193 libsup.sh:120 +#: sup:194 libsup.sh:120 msgid "Checking package dependencies" msgstr "" -#: sup:200 +#: sup:201 msgid "Working folder:" msgstr "" -#: sup:207 +#: sup:208 msgid "New package name:" msgstr "" -#: sup:213 +#: sup:214 msgid "Package already exists in wok:" msgstr "" -#: sup:216 +#: sup:217 msgid "Creating new package files and tree..." msgstr "" -#: sup:219 +#: sup:220 msgid "Executing your favorite editor..." msgstr "" -#: sup:221 +#: sup:222 msgid "To cook your package:" msgstr "" -#: sup:231 +#: sup:232 msgid "Can't find package file:" msgstr "" -#: sup:235 +#: sup:236 msgid "Extract package:" msgstr "" -#: sup:275 +#: sup:276 msgid "Can't find sup package:" msgstr "" -#: sup:281 +#: sup:282 msgid "SUP Update" msgstr "" -#: sup:286 +#: sup:287 msgid "Mirror is unreachable" msgstr "" -#: sup:292 +#: sup:293 msgid "Checking packages.sql..." msgstr "" -#: sup:311 +#: sup:312 msgid "Database timestamp:" msgstr "" -#: sup:313 +#: sup:314 msgid "Updated packages database:" msgstr "" -#: sup:318 +#: sup:319 msgid "Please try later. Missing packages database" msgstr "" -#: sup:326 +#: sup:327 msgid "Installed packages:" msgstr "" -#: sup:328 +#: sup:329 msgid "Package" msgstr "" -#: sup:328 +#: sup:329 msgid "Version" msgstr "" -#: sup:329 +#: sup:330 msgid "Status" msgstr "" -#: sup:355 +#: sup:356 msgid "rebuilt" msgstr "" -#: sup:366 +#: sup:367 msgid "Available updates:" msgstr "" -#: sup:375 +#: sup:376 msgid "Packages are up-to-date" msgstr "" -#: sup:387 sup:476 +#: sup:388 sup:485 msgid "Can't find installed package:" msgstr "" -#: sup:395 +#: sup:396 msgid "Searching for:" msgstr "" -#: sup:409 sup:446 +#: sup:410 sup:447 msgid "SUP packages in database:" msgstr "" -#: sup:421 +#: sup:422 msgid "Installed SUP packages:" msgstr "" -#: sup:429 +#: sup:430 msgid "No sup packages installed" msgstr "" -#: sup:433 +#: sup:434 msgid "SUP packages in your wok:" msgstr "" -#: sup:443 sup:453 +#: sup:444 sup:454 msgid "Cooked packages:" msgstr "" -#: sup:456 +#: sup:457 msgid "Downloads::" msgstr "" -#: sup:468 +#: sup:470 msgid "Installed package:" msgstr "" -#: sup:472 +#: sup:475 +msgid "Files list:" +msgstr "" + +#: sup:479 +msgid "Installed size:" +msgstr "" + +#: sup:481 msgid "Installed files:" msgstr "" diff -r 36795f3c1ef3 -r 9ff1a3400fb1 sup --- a/sup Fri Mar 10 09:12:43 2017 +0100 +++ b/sup Fri Mar 10 10:11:59 2017 +0100 @@ -27,7 +27,7 @@ help() { cat << EOT -$(boldify $(gettext "Usage:")) $(basename $0) [command|package] [package] +$(boldify $(gettext "Usage:")) $(basename $0) [command|package] [package|--option] $(boldify $(gettext "Commands:")) -i install $(gettext "Install a new package") @@ -46,6 +46,7 @@ --force update $(gettext "Force recharging packages database") --db list $(gettext "List all packages in database") --init cook $(gettext "Initialize sup cook environment") + --list info $(gettext "List installed files by a package") --verbose all $(gettext "Display more output messages") $(colorize 33 Manual) man sup @@ -459,8 +460,9 @@ ""|-h|help) help ;; - *) + *|info) # Display pkg info if installed + [ "$1" == "info" ] && shift pkg="$1" if [ -f "$installed/$pkg/receip" ]; then . ${installed}/${pkg}/receip @@ -469,8 +471,15 @@ separator echo "$SHORT_DESC" newline - colorize 036 "$(gettext 'Installed files:') ($sup_size)" - cat ${installed}/${pkg}/files.list + if [ "$list" ]; then + colorize 036 "$(gettext 'Files list:')" + cat ${installed}/${pkg}/files.list + separator "-" + fi + echo -n $(colorize 036 "$(gettext 'Installed size:')") + info 033 "$sup_size" + echo -n $(colorize 036 "$(gettext 'Installed files:')") + info 033 $(cat ${installed}/${pkg}/files.list | wc -l) newline else gettext "Can't find installed package:"; colorize 31 " $pkg"