# HG changeset patch # User Christophe Lincoln # Date 1249507225 -7200 # Node ID 7182c6b184c5670ea16fd40b36024333835e6d54 # Parent 1695ed3d901128ec2eeb58e286d5bc6400149a65 Prepa for release diff -r 1695ed3d9011 -r 7182c6b184c5 AUTHORS --- a/AUTHORS Sat Jul 18 10:47:39 2009 +0200 +++ b/AUTHORS Wed Aug 05 23:20:25 2009 +0200 @@ -1,3 +1,4 @@ Christophe Lincoln Pascal Bellard Eric Joseph-Alexandre +Paul Issott diff -r 1695ed3d9011 -r 7182c6b184c5 COPYING --- a/COPYING Sat Jul 18 10:47:39 2009 +0200 +++ b/COPYING Wed Aug 05 23:20:25 2009 +0200 @@ -2,23 +2,23 @@ =============================================================================== -Copyright (c) 2007-2008 SliTaz GNU/Linux +Copyright (c) 2007-2009 SliTaz GNU/Linux Français -------- -Tazpkg est un logiciel libre ; vous pouvez le redistribuer et/ou le -modifier conformément aux dispositions de la Licence Publique Générale GNU, -telle que publiée par la Free Software Foundation ; version 3 de la +Tazpkg est un logiciel libre ; vous pouvez le redistribuer et/ou le +modifier conformément aux dispositions de la Licence Publique Générale GNU, +telle que publiée par la Free Software Foundation ; version 3 de la licence, ou encore (à votre choix) toute version ultérieure. -Tazpkg est distribué dans l'espoir qu'il sera utile, mais SANS AUCUNE -GARANTIE ; sans même la garantie implicite de COMMERCIALISATION ou -D'ADAPTATION À UN OBJET PARTICULIER. Pour plus de détails, voir la Licence +Tazpkg est distribué dans l'espoir qu'il sera utile, mais SANS AUCUNE +GARANTIE ; sans même la garantie implicite de COMMERCIALISATION ou +D'ADAPTATION À UN OBJET PARTICULIER. Pour plus de détails, voir la Licence Publique Générale GNU. -Un exemplaire de la Licence Publique Générale GNU doit être fourni avec +Un exemplaire de la Licence Publique Générale GNU doit être fourni avec Tazpkg si ce n'est pas le cas, écrivez à la Free Software Foundation Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA @@ -33,7 +33,7 @@ Tazpkg is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS -FOR A PARTICULAR PURPOSE. See the GNU General Public License for +FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License diff -r 1695ed3d9011 -r 7182c6b184c5 README --- a/README Sat Jul 18 10:47:39 2009 +0200 +++ b/README Wed Aug 05 23:20:25 2009 +0200 @@ -1,9 +1,9 @@ -README for Tazpkg - Tiny autonomus packages manager 2008 +README for Tazpkg - Tiny autonomus packages manager 2009 =============================================================================== -Tazpkg est un gestionnaire de paquets ultra légé (~35 Ko) permettant -d'installer, lister, télécharger, enlever des paquets sur un système +Tazpkg est un gestionnaire de paquets ultra légé (~35 Ko) permettant +d'installer, lister, télécharger, enlever des paquets sur un système GNU/Linux. Tazpkg propose aussi une commande de recherche, pour générer une liste et des commandes pour la création de paquets. Il a été créé pour les besoins de SliTaz GNU/Linux, mini distribution autonome. Le format des paquets @@ -42,7 +42,7 @@ # cd into/tazpkg-sources # make install - + Uninstall : # make uninstall diff -r 1695ed3d9011 -r 7182c6b184c5 tazpkg --- a/tazpkg Sat Jul 18 10:47:39 2009 +0200 +++ b/tazpkg Wed Aug 05 23:20:25 2009 +0200 @@ -12,8 +12,9 @@ # Authors : Christophe Lincoln # Pascal Bellard # Eric Joseph-Alexandre +# Paul Issott # -VERSION=2.8.1 +VERSION=3.0 #################### # Script variables # @@ -61,8 +62,27 @@ INSTALL_LIST="" LOG=/var/log/tazpkg.log -# Bold red warning for upgrade. -WARNING="\\033[1;31mWARNING\\033[0;39m" +# Messages language setting --> line 230. +case $LANG in + fr*) + #. /usr/share/slitaz/messages/fr/tazpkg.msg + # Bold red warning for upgrade. + WARNING="\\033[1;31mATTENTION\\033[0;39m" + CHECK_FOR_PACKAGE_FILE_MSG="Impossible de trouver" + CHECK_FOR_RECEIPT_MSG="Impossible de trouver la receipt" + CHECK_FOR_INSTALLED_PACKAGE_MSG="\ +$PACKAGE est déjà installé. Vous pouvez utiliser l'option --forced pour +forcer l'installation ou supprimer le paquet et le réinstaller." ;; + *) + #. /usr/share/slitaz/messages/en/tazpkg.msg + # Bold red warning for upgrade. + WARNING="\\033[1;31mWARNING\\033[0;39m" + CHECK_FOR_PACKAGE_FILE_MSG="Unable to find" + CHECK_FOR_RECEIPT_MSG="Unable to find the receipt" + CHECK_FOR_INSTALLED_PACKAGE_MSG="\ +$PACKAGE is already installed. You can use the --forced option to force +installation or remove it and reinstall." ;; +esac # Check if the directories and files used by Tazpkg # exist. If not and user is root we create them. @@ -168,7 +188,7 @@ { if [ ! -f "$PACKAGE_FILE" ]; then echo -e " -Unable to find : $PACKAGE_FILE\n" +$CHECK_FOR_PACKAGE_FILE_MSG : $PACKAGE_FILE\n" exit 0 fi } @@ -177,7 +197,7 @@ check_for_receipt() { if [ ! -f "$1$INSTALLED/$PACKAGE/receipt" ]; then - echo -e "\nUnable to find the receipt : $1$INSTALLED/$PACKAGE/receipt\n" + echo -e "\n$CHECK_FOR_RECEIPT_MSG : $1$INSTALLED/$PACKAGE/receipt\n" exit 0 fi } @@ -207,9 +227,7 @@ check_for_installed_package() { if [ -n "$(get_installed_package_pathname $PACKAGE $1)" ]; then - echo -e " -$PACKAGE is already installed. You can use the --forced option to force -installation or remove it and reinstall.\n" + echo -e "\n$CHECK_FOR_INSTALLED_PACKAGE_MSG\n" exit 0 fi } @@ -221,9 +239,8 @@ if test $(id -u) = 0 ; then tazpkg recharge else - echo -e " -Unable to find the list : $LOCALSTATE/packages.list\n -You should probably run 'tazpkg recharge' as root to get the latest list of + echo -e "\nUnable to find the list : $LOCALSTATE/packages.list\n +You should probably run 'tazpkg recharge' as root to get the latest list of packages available on the mirror.\n" exit 0 fi @@ -331,7 +348,7 @@ extra=" - $(grep $PACKAGE-$VERSION $LOCALSTATE/installed.md5 | awk '{ print $1 }')" [ -e $LOG ] || touch $LOG DATE=`date +'%F %T'` - [ -w $LOG ] && + [ -w $LOG ] && echo "$DATE - $1 - $PACKAGE ($VERSION$EXTRAVERSION)$extra" >> $LOG } @@ -440,7 +457,7 @@ if [ -f $PACKAGE/files.list ]; then while read file; do grep -q "^$file$" $TMP_DIR/files.list && continue - for i in $(cat $PACKAGE/modifiers 2> /dev/null ; + for i in $(cat $PACKAGE/modifiers 2> /dev/null ; grep -sl $PACKAGE */modifiers | cut -d/ -f1 ); do grep -q "^$file$" $i/files.list && continue 2 done @@ -716,7 +733,7 @@ _EOT_ } -# Search pattern in installed packages. +# Search pattern in installed packages. search_in_installed_packages() { echo "Installed packages" @@ -743,7 +760,7 @@ fi } -# Search in packages.list for available pkgs. +# Search in packages.list for available pkgs. search_in_packages_list() { echo "Available packages name-version" @@ -768,8 +785,8 @@ fi } -# search --mirror: Search in packages.txt for available pkgs and give more -# info than --list or default. +# search --mirror: Search in packages.txt for available pkgs and give more +# info than --list or default. search_in_packages_txt() { echo "Matching packages name with version and desc" @@ -867,7 +884,7 @@ rm -f $1/mirror for i in $NEW_MIRROR_URL; do echo "$i" >> $1/mirror - done + done fi echo "" } @@ -1001,7 +1018,7 @@ CATEGORY="misc" SHORT_DESC="$descrip" WEB_SITE="http://www.slackware.com/packages/" -MAINTAINER="nobody@slitaz.org" +MAINTAINER="nobody@slitaz.org" DEPENDS="$(find_depends)" EOT show_unresolved_lib $file/receipt @@ -1050,7 +1067,7 @@ CATEGORY="misc" SHORT_DESC="$descrip" WEB_SITE="http://packages.debian.org/search?keywords=$package" -MAINTAINER="nobody@slitaz.org" +MAINTAINER="nobody@slitaz.org" DEPENDS="$(find_depends)" EOT show_unresolved_lib $file/receipt @@ -1087,7 +1104,7 @@ if (/^URL/) { goturl=1; printf "WEB_SITE=\"%s\"\n",$3; } } END { - if (goturl == 0) + if (goturl == 0) printf "WEB_SITE=\"http://rpmfind.net/linux/rpm2html/search.php?query=%s\"\n",name; printf "CATEGORY=\"misc\"\n"; printf "MAINTAINER=\"nobody@slitaz.org\"\n"; @@ -1099,7 +1116,7 @@ mv $TMP_DIR/receipt $TMP_DIR/$file rpm -qip $PACKAGE_FILE | awk ' DEGIN { show=0 } -{ +{ if (show) print; if (/^Description/) show=1; } @@ -1257,7 +1274,7 @@ echo "================================================================================" pkgs=`cat $LOCALSTATE/packages.list | wc -l` echo "$pkgs packages in the last recharged list." - echo "" + echo "" ;; list-files) # List files installed with the package. @@ -1357,7 +1374,7 @@ echo "================================================================================" if [ "$3" == "--mirror" ]; then - + match=0 for i in $LOCALSTATE/files.list.lzma \ $LOCALSTATE/undigest/*/files.list.lzma; do @@ -1453,7 +1470,7 @@ else LIST=`cat $2` fi - + # Remember processed list export INSTALL_LIST="$2" @@ -1651,7 +1668,7 @@ mkdir -p $TMP_DIR && cd $TMP_DIR FILES="$INSTALLED/*/volatile.cpio.gz" [ -n "$3" ] && FILES="$INSTALLED/$3/volatile.cpio.gz" - for i in $FILES; do + for i in $FILES; do zcat $i | cpio -idm > /dev/null find * -type f 2>/dev/null | while read file; do if [ ! -e /$file ]; then @@ -1671,7 +1688,7 @@ echo "" echo -e "\033[1mConfiguration files" echo "================================================================================" - for i in $INSTALLED/*/volatile.cpio.gz; do + for i in $INSTALLED/*/volatile.cpio.gz; do [ -n "$2" -a "$i" != "$INSTALLED/$2/volatile.cpio.gz" ] && continue [ -f "$i" ] || continue zcat $i | cpio -t | grep -v "[0-9]* blocks" @@ -1687,14 +1704,14 @@ CONFIG_VERSION=1.0 mkdir config-$CONFIG_VERSION cd config-$CONFIG_VERSION - for i in $INSTALLED/*/volatile.cpio.gz; do + for i in $INSTALLED/*/volatile.cpio.gz; do zcat $i | cpio -t | grep -v "[0-9]* blocks" done > files.list mkdir fs cd fs ( cd / ; cpio -o -H newc ) < ../files.list | cpio -idm > /dev/null mkdir -p etc/tazlito - for i in $INSTALLED/*/receipt; do + for i in $INSTALLED/*/receipt; do EXTRAVERSION="" . $i echo "$PACKAGE-$VERSION$EXTRAVERSION" @@ -1825,8 +1842,8 @@ md5sum description.txt 2> /dev/null | awk \ '{ sz=$1 } END { print sz }') echo -n "Undating receipt sizes..." - sed -i s/^PACKED_SIZE.*$// receipt - sed -i s/^UNPACKED_SIZE.*$// receipt + sed -i s/^PACKED_SIZE.*$// receipt + sed -i s/^UNPACKED_SIZE.*$// receipt sed -i "s/^PACKAGE=/PACKED_SIZE=\"$PACKED_SIZE\"\nUNPACKED_SIZE=\"$UNPACKED_SIZE\"\nPACKAGE=/" receipt status echo -n "Creating full cpio archive... " @@ -1922,7 +1939,7 @@ ALL="$(ls -d $INSTALLED/*)" fi for pkg in $ALL - do + do [ -f $pkg/receipt ] || continue EXTRAVERSION="" . $pkg/receipt @@ -1958,7 +1975,7 @@ [ "$current_md5" != "$new_md5" ] && RELEASE=build fi if [ "$VERSION" != "$NEW_VERSION" -o -n "$RELEASE" ]; then - # Version seems different. Check for major, minor or + # Version seems different. Check for major, minor or # revision PKG_MAJOR=`echo ${VERSION%_*} | cut -f1 -d"."` NEW_MAJOR=`echo ${NEW_VERSION%_*} | cut -f1 -d"."` @@ -2359,7 +2376,7 @@ post_install $ROOT # Log this activity [ -n "$ROOT" ] || log Reconfigured - else + else echo -e "\nNothing to do for $PACKAGE." fi else @@ -2486,9 +2503,7 @@ ;; usage|*) # Print a short help or give usage for an unknown or empty command. - # - usage - ;; + usage ;; esac exit 0 diff -r 1695ed3d9011 -r 7182c6b184c5 tazpkgbox --- a/tazpkgbox Sat Jul 18 10:47:39 2009 +0200 +++ b/tazpkgbox Wed Aug 05 23:20:25 2009 +0200 @@ -1,12 +1,12 @@ #!/bin/sh # -# GTKdialog interface to SliTaz Packages Manager aka Tazpkg. Notes: -# Notebook tab are vbox, tabs are used to indent and functions are +# GTKdialog interface to SliTaz Packages Manager aka Tazpkg. Notes: +# Notebook tab are vbox, tabs are used to indent and functions are # split and found in $LIB. # # (C) GNU gpl v3 - SliTaz GNU/Linux 2009. # -VERSION=2.8.1 +VERSION=3.0 # Functions path. export LIB=/usr/lib/slitaz/tazpkgbox @@ -116,7 +116,7 @@