# HG changeset patch # User Christophe Lincoln # Date 1488131555 -3600 # Node ID 6e287a70e3d7147448d36d59fecf498bdc34c531 # Parent 2aef3b78e30a10fea87795dbc49e1ef027bcc6a8 Some improvmend on the cosmetic side diff -r 2aef3b78e30a -r 6e287a70e3d7 data/sup-install.desktop --- a/data/sup-install.desktop Sun Feb 26 17:59:31 2017 +0100 +++ b/data/sup-install.desktop Sun Feb 26 18:52:35 2017 +0100 @@ -1,7 +1,7 @@ [Desktop Entry] Type=Application -Name=SUP Install -Exec=terminal -geometry 80x10 -hold -e sup install %f -Icon=system-software-installer +Name=Install SUP Package +Exec=terminal -geometry 80x20 -hold -e sup install %f +Icon=package-install NoDisplay=true MimeType=application/x-sup; diff -r 2aef3b78e30a -r 6e287a70e3d7 libsup.sh --- a/libsup.sh Sun Feb 26 17:59:31 2017 +0100 +++ b/libsup.sh Sun Feb 26 18:52:35 2017 +0100 @@ -23,14 +23,13 @@ supcook="$HOME/sup-cook" cooked="$supcook/packages" +export TEXTDOMAIN='sup-clients' +alias wget="busybox wget" + # # Functions # -get() { - busybox wget "$1" -} - # Extract a sup package: extract_sup "/path/to/pkg.sup" extract_sup() { pkg="$(basename ${1%.sup})" @@ -87,7 +86,9 @@ # have to dl and move files where they were in $HOME cd files if grep -q "^sup_install" ../receip; then - gettext "Executing install function:"; colorize 33 " sup_install" + local in=$(($(stty size | cut -d " " -f 2) - 15)) + gettext "Executing install function:" + indent ${in} $(colorize 33 " sup_install") sup_install fi @@ -114,5 +115,7 @@ for file in $(ls -A files); do cp -rf files/${file} ${HOME} done && status - rm -rf ${cache} && separator && newline + separator + gettext "Installed files:"; colorize 35 " $(cat files.list | wc -l)" + newline && rm -rf ${cache} } diff -r 2aef3b78e30a -r 6e287a70e3d7 po/clients/fr.po --- a/po/clients/fr.po Sun Feb 26 17:59:31 2017 +0100 +++ b/po/clients/fr.po Sun Feb 26 18:52:35 2017 +0100 @@ -9,11 +9,11 @@ "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-02-23 21:13+0100\n" "PO-Revision-Date: 2017-02-23 14:15+0100\n" -"Last-Translator: Linux User \n" +"Last-Translator: Christophe Lincoln \n" "Language-Team: French\n" "Language: fr\n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=ASCII\n" +"Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" "X-Generator: Poedit 1.8.6\n" diff -r 2aef3b78e30a -r 6e287a70e3d7 sup --- a/sup Sun Feb 26 17:59:31 2017 +0100 +++ b/sup Sun Feb 26 18:52:35 2017 +0100 @@ -6,9 +6,9 @@ # Author: Christophe Lincoln # if [ -f "/usr/lib/slitaz/libsup.sh" ]; then + . ./libsup.sh +else . /usr/lib/slitaz/libsup.sh -else - . ./libsup.sh fi # Sanity check diff -r 2aef3b78e30a -r 6e287a70e3d7 wok/sup-demo/receip --- a/wok/sup-demo/receip Sun Feb 26 17:59:31 2017 +0100 +++ b/wok/sup-demo/receip Sun Feb 26 18:52:35 2017 +0100 @@ -14,5 +14,5 @@ # Here are the optional install rules (download, configure, etc) sup_install() { - echo "Running sup_install() sequence" + echo "Hello :-) I'm a demo package!" }