# HG changeset patch # User Pascal Bellard # Date 1375105729 -7200 # Node ID ab8765351870a9ec19db2e4818c8b680ff3eeece # Parent 8792c17fbd8fa2d7a42eea3eb5cfb13c325e9c1b tazpkg/convert: add .sb support diff -r 8792c17fbd8f -r ab8765351870 po/el.po --- a/po/el.po Mon Jul 29 14:52:03 2013 +0200 +++ b/po/el.po Mon Jul 29 15:48:49 2013 +0200 @@ -251,9 +251,9 @@ msgstr "Εμφάνιση δένδρου αντίστροφων εξαρτήσεων." #: tazpkg:149 -msgid "Convert a deb/rpm/tgz/pet/sfs/arch/ipk package to a slitaz (.tazpkg)." +msgid "Convert a deb/rpm/tgz/pet/sfs/sb/arch/ipk package to a slitaz (.tazpkg)." msgstr "" -"Μετατροπή ενός πακέτου deb/rpm/tgz/pet/arch/ipk σε μορφή slitaz\n" +"Μετατροπή ενός πακέτου deb/rpm/tgz/pet/sfs/sb/arch/ipk σε μορφή slitaz\n" " (.tazpkg)." #: tazpkg:150 diff -r 8792c17fbd8f -r ab8765351870 po/es.po --- a/po/es.po Mon Jul 29 14:52:03 2013 +0200 +++ b/po/es.po Mon Jul 29 15:48:49 2013 +0200 @@ -233,8 +233,8 @@ msgstr "Mostrar en reverso el árbol de dependencias." #: tazpkg:149 -msgid "Convert a deb/rpm/tgz/pet/sfs/arch/ipk package to a slitaz (.tazpkg)." -msgstr "Convertir paquetes deb/rpm/tgz/pet/arch/ipk al de slitaz (.tazpkg)." +msgid "Convert a deb/rpm/tgz/pet/sfs/sb/arch/ipk package to a slitaz (.tazpkg)." +msgstr "Convertir paquetes deb/rpm/tgz/pet/sfs/sb/arch/ipk al de slitaz (.tazpkg)." #: tazpkg:150 msgid "Link a package from another slitaz installation." diff -r 8792c17fbd8f -r ab8765351870 po/fr.po --- a/po/fr.po Mon Jul 29 14:52:03 2013 +0200 +++ b/po/fr.po Mon Jul 29 15:48:49 2013 +0200 @@ -229,8 +229,8 @@ msgstr "Affiche l'arbre des dépendances inverses." #: tazpkg:149 -msgid "Convert a deb/rpm/tgz/pet/sfs/arch/ipk package to a slitaz (.tazpkg)." -msgstr "Convertit un paquet deb/rpm/tgz/pet/arch/ipk en paquet SliTaz." +msgid "Convert a deb/rpm/tgz/pet/sfs/sb/arch/ipk package to a slitaz (.tazpkg)." +msgstr "Convertit un paquet deb/rpm/tgz/pet/sfs/sb/arch/ipk en paquet SliTaz." #: tazpkg:150 msgid "Link a package from another slitaz installation." diff -r 8792c17fbd8f -r ab8765351870 po/pl.po --- a/po/pl.po Mon Jul 29 14:52:03 2013 +0200 +++ b/po/pl.po Mon Jul 29 15:48:49 2013 +0200 @@ -231,7 +231,7 @@ msgstr "" #: tazpkg:149 -msgid "Convert a deb/rpm/tgz/pet/sfs/arch/ipk package to a slitaz (.tazpkg)." +msgid "Convert a deb/rpm/tgz/pet/sfs/sb/arch/ipk package to a slitaz (.tazpkg)." msgstr "" #: tazpkg:150 diff -r 8792c17fbd8f -r ab8765351870 po/pt_BR.po --- a/po/pt_BR.po Mon Jul 29 14:52:03 2013 +0200 +++ b/po/pt_BR.po Mon Jul 29 15:48:49 2013 +0200 @@ -225,8 +225,8 @@ msgstr "Mostra árvore de dependências reversa." #: tazpkg:149 -msgid "Convert a deb/rpm/tgz/pet/sfs/arch/ipk package to a slitaz (.tazpkg)." -msgstr "Converte um pacote deb/rpm/tgz/pet/arch/ipk para .tazpkg." +msgid "Convert a deb/rpm/tgz/pet/sfs/sb/arch/ipk package to a slitaz (.tazpkg)." +msgstr "Converte um pacote deb/rpm/tgz/pet/sfs/sb/arch/ipk para .tazpkg." #: tazpkg:150 msgid "Link a package from another slitaz installation." diff -r 8792c17fbd8f -r ab8765351870 po/ru.po --- a/po/ru.po Mon Jul 29 14:52:03 2013 +0200 +++ b/po/ru.po Mon Jul 29 15:48:49 2013 +0200 @@ -230,8 +230,8 @@ msgstr "Показать дерево обратных зависимостей" #: tazpkg:149 -msgid "Convert a deb/rpm/tgz/pet/sfs/arch/ipk package to a slitaz (.tazpkg)." -msgstr "Конвертировать пакеты deb|rpm|tgz|pet|arch|ipk в формат tazpkg" +msgid "Convert a deb/rpm/tgz/pet/sfs/sb/arch/ipk package to a slitaz (.tazpkg)." +msgstr "Конвертировать пакеты deb|rpm|tgz|pet|sfs|sb|arch|ipk в формат tazpkg" #: tazpkg:150 msgid "Link a package from another slitaz installation." diff -r 8792c17fbd8f -r ab8765351870 po/sv.po --- a/po/sv.po Mon Jul 29 14:52:03 2013 +0200 +++ b/po/sv.po Mon Jul 29 15:48:49 2013 +0200 @@ -226,7 +226,7 @@ msgstr "" #: tazpkg:149 -msgid "Convert a deb/rpm/tgz/pet/sfs/arch/ipk package to a slitaz (.tazpkg)." +msgid "Convert a deb/rpm/tgz/pet/sfs/sb/arch/ipk package to a slitaz (.tazpkg)." msgstr "" #: tazpkg:150 diff -r 8792c17fbd8f -r ab8765351870 po/tazpkg.pot --- a/po/tazpkg.pot Mon Jul 29 14:52:03 2013 +0200 +++ b/po/tazpkg.pot Mon Jul 29 15:48:49 2013 +0200 @@ -225,7 +225,7 @@ msgstr "" #: tazpkg:149 -msgid "Convert a deb/rpm/tgz/pet/sfs/arch/ipk package to a slitaz (.tazpkg)." +msgid "Convert a deb/rpm/tgz/pet/sfs/sb/arch/ipk package to a slitaz (.tazpkg)." msgstr "" #: tazpkg:150 diff -r 8792c17fbd8f -r ab8765351870 tazpkg --- a/tazpkg Mon Jul 29 14:52:03 2013 +0200 +++ b/tazpkg Mon Jul 29 15:48:49 2013 +0200 @@ -146,7 +146,7 @@ clean-cache|-cc $(gettext 'Clean all packages downloaded in cache directory.') depends $(gettext 'Display dependencies tree.') rdepends $(gettext 'Display reverse dependencies tree.') - convert $(gettext 'Convert a deb/rpm/tgz/pet/sfs/arch/ipk package to a slitaz (.tazpkg).') + convert $(gettext 'Convert a deb/rpm/tgz/pet/sfs/sb/arch/ipk package to a slitaz (.tazpkg).') link $(gettext 'Link a package from another slitaz installation.') setup-mirror|-sm $(gettext 'Change the mirror url configuration.') list-undigest $(gettext 'List undigest mirrors.') @@ -1218,7 +1218,7 @@ # get package and version from PACKAGE_FILE parse_pkgname() { - package=$(basename $PACKAGE_FILE $1) + package=$(basename ${2:-$PACKAGE_FILE} $1) IFS='-' set -- $package unset IFS @@ -1228,13 +1228,13 @@ package=${1%%[0-9\.]*} version=${1#$package} fi + file="$package-$version" + mkdir $file } finish_convert_puppy() { rm -f fs/*.specs - file="$package-$version" - mkdir $file mv fs $file cat > $file/receipt < $file/description.txt + mv fs $file + cat > $file/receipt <> $file/receipt <