tazpkg rev 279 3.0

Prepa for release
author Christophe Lincoln <pankso@slitaz.org>
date Wed Aug 05 23:20:25 2009 +0200 (2009-08-05)
parents 1695ed3d9011
children dd4c066a3213
files AUTHORS COPYING README tazpkg tazpkgbox
line diff
     1.1 --- a/AUTHORS	Sat Jul 18 10:47:39 2009 +0200
     1.2 +++ b/AUTHORS	Wed Aug 05 23:20:25 2009 +0200
     1.3 @@ -1,3 +1,4 @@
     1.4  Christophe Lincoln <pankso@slitaz.org>
     1.5  Pascal Bellard <pascal.bellard@slitaz.org>
     1.6  Eric Joseph-Alexandre <erjo@slitaz.org>
     1.7 +Paul Issott <paul@slitaz.org>
     2.1 --- a/COPYING	Sat Jul 18 10:47:39 2009 +0200
     2.2 +++ b/COPYING	Wed Aug 05 23:20:25 2009 +0200
     2.3 @@ -2,23 +2,23 @@
     2.4  ===============================================================================
     2.5  
     2.6  
     2.7 -Copyright (c)  2007-2008  SliTaz GNU/Linux
     2.8 +Copyright (c)  2007-2009  SliTaz GNU/Linux
     2.9  
    2.10  
    2.11  Français
    2.12  --------
    2.13  
    2.14 -Tazpkg est un logiciel libre ; vous pouvez le redistribuer et/ou le 
    2.15 -modifier conformément aux dispositions de la Licence Publique Générale GNU, 
    2.16 -telle que publiée par la Free Software Foundation ; version 3 de la 
    2.17 +Tazpkg est un logiciel libre ; vous pouvez le redistribuer et/ou le
    2.18 +modifier conformément aux dispositions de la Licence Publique Générale GNU,
    2.19 +telle que publiée par la Free Software Foundation ; version 3 de la
    2.20  licence, ou encore (à votre choix) toute version ultérieure.
    2.21  
    2.22 -Tazpkg est distribué dans l'espoir qu'il sera utile, mais SANS AUCUNE 
    2.23 -GARANTIE ; sans même la garantie implicite de COMMERCIALISATION ou 
    2.24 -D'ADAPTATION À UN OBJET PARTICULIER. Pour plus de détails, voir la Licence 
    2.25 +Tazpkg est distribué dans l'espoir qu'il sera utile, mais SANS AUCUNE
    2.26 +GARANTIE ; sans même la garantie implicite de COMMERCIALISATION ou
    2.27 +D'ADAPTATION À UN OBJET PARTICULIER. Pour plus de détails, voir la Licence
    2.28  Publique Générale GNU.
    2.29  
    2.30 -Un exemplaire de la Licence Publique Générale GNU doit être fourni avec 
    2.31 +Un exemplaire de la Licence Publique Générale GNU doit être fourni avec
    2.32  Tazpkg si ce n'est pas le cas, écrivez à la Free Software Foundation
    2.33  Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
    2.34  
    2.35 @@ -33,7 +33,7 @@
    2.36  
    2.37  Tazpkg is distributed in the hope that it will be useful, but WITHOUT
    2.38  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
    2.39 -FOR A PARTICULAR PURPOSE.  See the GNU General Public License for 
    2.40 +FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
    2.41  more details.
    2.42  
    2.43  You should have received a copy of the GNU General Public License
     3.1 --- a/README	Sat Jul 18 10:47:39 2009 +0200
     3.2 +++ b/README	Wed Aug 05 23:20:25 2009 +0200
     3.3 @@ -1,9 +1,9 @@
     3.4 -README for Tazpkg -  Tiny autonomus packages manager                       2008
     3.5 +README for Tazpkg -  Tiny autonomus packages manager                       2009
     3.6  ===============================================================================
     3.7  
     3.8  
     3.9 -Tazpkg est un gestionnaire de paquets ultra légé (~35 Ko) permettant 
    3.10 -d'installer, lister, télécharger, enlever des paquets sur un système 
    3.11 +Tazpkg est un gestionnaire de paquets ultra légé (~35 Ko) permettant
    3.12 +d'installer, lister, télécharger, enlever des paquets sur un système
    3.13  GNU/Linux. Tazpkg propose aussi une commande de recherche, pour générer une
    3.14  liste et des commandes pour la création de paquets. Il a été créé pour les
    3.15  besoins de SliTaz GNU/Linux, mini distribution autonome. Le format des paquets
    3.16 @@ -42,7 +42,7 @@
    3.17  
    3.18   # cd into/tazpkg-sources
    3.19   # make install
    3.20 - 
    3.21 +
    3.22  Uninstall :
    3.23   # make uninstall
    3.24  
     4.1 --- a/tazpkg	Sat Jul 18 10:47:39 2009 +0200
     4.2 +++ b/tazpkg	Wed Aug 05 23:20:25 2009 +0200
     4.3 @@ -12,8 +12,9 @@
     4.4  # Authors : Christophe Lincoln <pankso@slitaz.org>
     4.5  #           Pascal Bellard <pascal.bellard@slitaz.org>
     4.6  #           Eric Joseph-Alexandre <erjo@slitaz.org>
     4.7 +#           Paul Issott <paul@slitaz.org>
     4.8  #
     4.9 -VERSION=2.8.1
    4.10 +VERSION=3.0
    4.11  
    4.12  ####################
    4.13  # Script variables #
    4.14 @@ -61,8 +62,27 @@
    4.15  INSTALL_LIST=""
    4.16  LOG=/var/log/tazpkg.log
    4.17  
    4.18 -# Bold red warning for upgrade.
    4.19 -WARNING="\\033[1;31mWARNING\\033[0;39m"
    4.20 +# Messages language setting --> line 230.
    4.21 +case $LANG in
    4.22 +	fr*)
    4.23 +		#. /usr/share/slitaz/messages/fr/tazpkg.msg
    4.24 +		# Bold red warning for upgrade.
    4.25 +		WARNING="\\033[1;31mATTENTION\\033[0;39m"
    4.26 +		CHECK_FOR_PACKAGE_FILE_MSG="Impossible de trouver"
    4.27 +		CHECK_FOR_RECEIPT_MSG="Impossible de trouver la receipt"
    4.28 +		CHECK_FOR_INSTALLED_PACKAGE_MSG="\
    4.29 +$PACKAGE est déjà installé. Vous pouvez utiliser l'option --forced pour
    4.30 +forcer l'installation ou supprimer le paquet et le réinstaller." ;;
    4.31 +	*)
    4.32 +		#. /usr/share/slitaz/messages/en/tazpkg.msg
    4.33 +		# Bold red warning for upgrade.
    4.34 +		WARNING="\\033[1;31mWARNING\\033[0;39m"
    4.35 +		CHECK_FOR_PACKAGE_FILE_MSG="Unable to find"
    4.36 +		CHECK_FOR_RECEIPT_MSG="Unable to find the receipt"
    4.37 +		CHECK_FOR_INSTALLED_PACKAGE_MSG="\
    4.38 +$PACKAGE is already installed. You can use the --forced option to force
    4.39 +installation or remove it and reinstall." ;;
    4.40 +esac
    4.41  
    4.42  # Check if the directories and files used by Tazpkg
    4.43  # exist. If not and user is root we create them.
    4.44 @@ -168,7 +188,7 @@
    4.45  {
    4.46  	if [ ! -f "$PACKAGE_FILE" ]; then
    4.47  		echo -e "
    4.48 -Unable to find : $PACKAGE_FILE\n"
    4.49 +$CHECK_FOR_PACKAGE_FILE_MSG : $PACKAGE_FILE\n"
    4.50  		exit 0
    4.51  	fi
    4.52  }
    4.53 @@ -177,7 +197,7 @@
    4.54  check_for_receipt()
    4.55  {
    4.56  	if [ ! -f "$1$INSTALLED/$PACKAGE/receipt" ]; then
    4.57 -		echo -e "\nUnable to find the receipt : $1$INSTALLED/$PACKAGE/receipt\n"
    4.58 +		echo -e "\n$CHECK_FOR_RECEIPT_MSG : $1$INSTALLED/$PACKAGE/receipt\n"
    4.59  		exit 0
    4.60  	fi
    4.61  }
    4.62 @@ -207,9 +227,7 @@
    4.63  check_for_installed_package()
    4.64  {
    4.65  	if [ -n "$(get_installed_package_pathname $PACKAGE $1)" ]; then
    4.66 -		echo -e "
    4.67 -$PACKAGE is already installed. You can use the --forced option to force
    4.68 -installation or remove it and reinstall.\n"
    4.69 +		echo -e "\n$CHECK_FOR_INSTALLED_PACKAGE_MSG\n"
    4.70  		exit 0
    4.71  	fi
    4.72  }
    4.73 @@ -221,9 +239,8 @@
    4.74  		if test $(id -u) = 0 ; then
    4.75  			tazpkg recharge
    4.76  		else
    4.77 -			echo -e "
    4.78 -Unable to find the list : $LOCALSTATE/packages.list\n
    4.79 -You should probably run 'tazpkg recharge' as root to get the latest list of 
    4.80 +			echo -e "\nUnable to find the list : $LOCALSTATE/packages.list\n
    4.81 +You should probably run 'tazpkg recharge' as root to get the latest list of
    4.82  packages available on the mirror.\n"
    4.83  			exit 0
    4.84  		fi
    4.85 @@ -331,7 +348,7 @@
    4.86  	extra=" - $(grep $PACKAGE-$VERSION $LOCALSTATE/installed.md5 | awk '{ print $1 }')"
    4.87  	[ -e $LOG ] || touch $LOG
    4.88  	DATE=`date +'%F %T'`
    4.89 -	[ -w $LOG ] && 
    4.90 +	[ -w $LOG ] &&
    4.91  	echo "$DATE - $1 - $PACKAGE ($VERSION$EXTRAVERSION)$extra" >> $LOG
    4.92  }
    4.93  
    4.94 @@ -440,7 +457,7 @@
    4.95  	if [ -f $PACKAGE/files.list ]; then
    4.96  		while read file; do
    4.97  			grep -q "^$file$" $TMP_DIR/files.list && continue
    4.98 -			for i in $(cat $PACKAGE/modifiers 2> /dev/null ; 
    4.99 +			for i in $(cat $PACKAGE/modifiers 2> /dev/null ;
   4.100  			    grep -sl $PACKAGE */modifiers | cut -d/ -f1 ); do
   4.101  				grep -q "^$file$" $i/files.list && continue 2
   4.102  			done
   4.103 @@ -716,7 +733,7 @@
   4.104  _EOT_
   4.105  }
   4.106  
   4.107 -# Search pattern in installed packages.		
   4.108 +# Search pattern in installed packages.
   4.109  search_in_installed_packages()
   4.110  {
   4.111  	echo "Installed packages"
   4.112 @@ -743,7 +760,7 @@
   4.113  	fi
   4.114  }
   4.115  
   4.116 -# Search in packages.list for available pkgs.	
   4.117 +# Search in packages.list for available pkgs.
   4.118  search_in_packages_list()
   4.119  {
   4.120  	echo "Available packages name-version"
   4.121 @@ -768,8 +785,8 @@
   4.122  	fi
   4.123  }
   4.124  
   4.125 -# search --mirror: Search in packages.txt for available pkgs and give more 
   4.126 -# info than --list or default.	
   4.127 +# search --mirror: Search in packages.txt for available pkgs and give more
   4.128 +# info than --list or default.
   4.129  search_in_packages_txt()
   4.130  {
   4.131  	echo "Matching packages name with version and desc"
   4.132 @@ -867,7 +884,7 @@
   4.133  		rm -f $1/mirror
   4.134  		for i in $NEW_MIRROR_URL; do
   4.135  			echo "$i" >> $1/mirror
   4.136 -		done 
   4.137 +		done
   4.138  	fi
   4.139  	echo ""
   4.140  }
   4.141 @@ -1001,7 +1018,7 @@
   4.142  CATEGORY="misc"
   4.143  SHORT_DESC="$descrip"
   4.144  WEB_SITE="http://www.slackware.com/packages/"
   4.145 -MAINTAINER="nobody@slitaz.org" 
   4.146 +MAINTAINER="nobody@slitaz.org"
   4.147  DEPENDS="$(find_depends)"
   4.148  EOT
   4.149  		show_unresolved_lib $file/receipt
   4.150 @@ -1050,7 +1067,7 @@
   4.151  CATEGORY="misc"
   4.152  SHORT_DESC="$descrip"
   4.153  WEB_SITE="http://packages.debian.org/search?keywords=$package"
   4.154 -MAINTAINER="nobody@slitaz.org" 
   4.155 +MAINTAINER="nobody@slitaz.org"
   4.156  DEPENDS="$(find_depends)"
   4.157  EOT
   4.158  	show_unresolved_lib $file/receipt
   4.159 @@ -1087,7 +1104,7 @@
   4.160  	if (/^URL/) { goturl=1; printf "WEB_SITE=\"%s\"\n",$3; }
   4.161  }
   4.162  END {
   4.163 -	if (goturl == 0) 
   4.164 +	if (goturl == 0)
   4.165  		printf "WEB_SITE=\"http://rpmfind.net/linux/rpm2html/search.php?query=%s\"\n",name;
   4.166  	printf "CATEGORY=\"misc\"\n";
   4.167  	printf "MAINTAINER=\"nobody@slitaz.org\"\n";
   4.168 @@ -1099,7 +1116,7 @@
   4.169  	mv $TMP_DIR/receipt $TMP_DIR/$file
   4.170  	rpm -qip $PACKAGE_FILE | awk '
   4.171  DEGIN { show=0 }
   4.172 -{ 
   4.173 +{
   4.174    if (show) print;
   4.175    if (/^Description/) show=1;
   4.176  }
   4.177 @@ -1257,7 +1274,7 @@
   4.178  		echo "================================================================================"
   4.179  		pkgs=`cat $LOCALSTATE/packages.list | wc -l`
   4.180  		echo "$pkgs packages in the last recharged list."
   4.181 -		echo "" 
   4.182 +		echo ""
   4.183  		;;
   4.184  	list-files)
   4.185  		# List files installed with the package.
   4.186 @@ -1357,7 +1374,7 @@
   4.187  		echo "================================================================================"
   4.188  
   4.189  		if [ "$3" == "--mirror" ]; then
   4.190 -		
   4.191 +
   4.192  			match=0
   4.193  			for i in $LOCALSTATE/files.list.lzma \
   4.194  				 $LOCALSTATE/undigest/*/files.list.lzma; do
   4.195 @@ -1453,7 +1470,7 @@
   4.196  		else
   4.197  			LIST=`cat $2`
   4.198  		fi
   4.199 -		
   4.200 +
   4.201  		# Remember processed list
   4.202  		export INSTALL_LIST="$2"
   4.203  
   4.204 @@ -1651,7 +1668,7 @@
   4.205  			mkdir -p $TMP_DIR && cd $TMP_DIR
   4.206  			FILES="$INSTALLED/*/volatile.cpio.gz"
   4.207  			[ -n "$3" ] && FILES="$INSTALLED/$3/volatile.cpio.gz"
   4.208 -			for i in $FILES; do 
   4.209 +			for i in $FILES; do
   4.210  				zcat $i | cpio -idm > /dev/null
   4.211  				find * -type f 2>/dev/null | while read file; do
   4.212  					if [ ! -e /$file ]; then
   4.213 @@ -1671,7 +1688,7 @@
   4.214  			echo ""
   4.215  			echo -e "\033[1mConfiguration files"
   4.216  			echo "================================================================================"
   4.217 -			for i in $INSTALLED/*/volatile.cpio.gz; do 
   4.218 +			for i in $INSTALLED/*/volatile.cpio.gz; do
   4.219  				[ -n "$2" -a "$i" != "$INSTALLED/$2/volatile.cpio.gz" ] && continue
   4.220  				[ -f "$i" ] || continue
   4.221  				zcat $i | cpio -t | grep -v "[0-9]* blocks"
   4.222 @@ -1687,14 +1704,14 @@
   4.223  		CONFIG_VERSION=1.0
   4.224  		mkdir config-$CONFIG_VERSION
   4.225  		cd config-$CONFIG_VERSION
   4.226 -		for i in $INSTALLED/*/volatile.cpio.gz; do 
   4.227 +		for i in $INSTALLED/*/volatile.cpio.gz; do
   4.228  			zcat $i | cpio -t | grep -v "[0-9]* blocks"
   4.229  		done > files.list
   4.230  		mkdir fs
   4.231  		cd fs
   4.232  		( cd / ; cpio -o -H newc ) < ../files.list | cpio -idm > /dev/null
   4.233  		mkdir -p etc/tazlito
   4.234 -		for i in $INSTALLED/*/receipt; do 
   4.235 +		for i in $INSTALLED/*/receipt; do
   4.236  			EXTRAVERSION=""
   4.237  			. $i
   4.238  			echo "$PACKAGE-$VERSION$EXTRAVERSION"
   4.239 @@ -1825,8 +1842,8 @@
   4.240  				md5sum description.txt 2> /dev/null | awk \
   4.241  				'{ sz=$1 } END { print sz }')
   4.242  			echo -n "Undating receipt sizes..."
   4.243 -			sed -i s/^PACKED_SIZE.*$// receipt	
   4.244 -			sed -i s/^UNPACKED_SIZE.*$// receipt	
   4.245 +			sed -i s/^PACKED_SIZE.*$// receipt
   4.246 +			sed -i s/^UNPACKED_SIZE.*$// receipt
   4.247  			sed -i "s/^PACKAGE=/PACKED_SIZE=\"$PACKED_SIZE\"\nUNPACKED_SIZE=\"$UNPACKED_SIZE\"\nPACKAGE=/" receipt
   4.248  			status
   4.249  			echo -n "Creating full cpio archive... "
   4.250 @@ -1922,7 +1939,7 @@
   4.251  			ALL="$(ls -d $INSTALLED/*)"
   4.252  		fi
   4.253  		for pkg in $ALL
   4.254 -		do 
   4.255 +		do
   4.256  			[ -f $pkg/receipt ] || continue
   4.257  			EXTRAVERSION=""
   4.258  			. $pkg/receipt
   4.259 @@ -1958,7 +1975,7 @@
   4.260  						[ "$current_md5" != "$new_md5" ] && RELEASE=build
   4.261  					fi
   4.262  					if [ "$VERSION" != "$NEW_VERSION" -o -n "$RELEASE" ]; then
   4.263 -						# Version seems different. Check for major, minor or 
   4.264 +						# Version seems different. Check for major, minor or
   4.265  						# revision
   4.266  						PKG_MAJOR=`echo ${VERSION%_*} | cut -f1 -d"."`
   4.267  						NEW_MAJOR=`echo ${NEW_VERSION%_*} | cut -f1 -d"."`
   4.268 @@ -2359,7 +2376,7 @@
   4.269  				post_install $ROOT
   4.270  				# Log this activity
   4.271  				[ -n "$ROOT" ] || log Reconfigured
   4.272 -			else 
   4.273 +			else
   4.274  				echo -e "\nNothing to do for $PACKAGE."
   4.275  			fi
   4.276  		else
   4.277 @@ -2486,9 +2503,7 @@
   4.278  		;;
   4.279  	usage|*)
   4.280  		# Print a short help or give usage for an unknown or empty command.
   4.281 -		#
   4.282 -		usage
   4.283 -		;;
   4.284 +		usage ;;
   4.285  esac
   4.286  
   4.287  exit 0
     5.1 --- a/tazpkgbox	Sat Jul 18 10:47:39 2009 +0200
     5.2 +++ b/tazpkgbox	Wed Aug 05 23:20:25 2009 +0200
     5.3 @@ -1,12 +1,12 @@
     5.4  #!/bin/sh
     5.5  #
     5.6 -# GTKdialog interface to SliTaz Packages Manager aka Tazpkg. Notes: 
     5.7 -# Notebook tab are vbox, tabs are used to indent and functions are 
     5.8 +# GTKdialog interface to SliTaz Packages Manager aka Tazpkg. Notes:
     5.9 +# Notebook tab are vbox, tabs are used to indent and functions are
    5.10  # split and found in $LIB.
    5.11  #
    5.12  # (C) GNU gpl v3 - SliTaz GNU/Linux 2009.
    5.13  #
    5.14 -VERSION=2.8.1
    5.15 +VERSION=3.0
    5.16  
    5.17  # Functions path.
    5.18  export LIB=/usr/lib/slitaz/tazpkgbox
    5.19 @@ -116,7 +116,7 @@
    5.20  	<frame Français>
    5.21  		<text wrap=\"false\">
    5.22  			<label>\"
    5.23 -Une image ISO installable sur clé USB ou gravable sur DVD est 
    5.24 +Une image ISO installable sur clé USB ou gravable sur DVD est
    5.25  disponible sur les mirroirs Slitaz. Elle contient tous les paquets
    5.26  de la version $(cat /etc/slitaz-release) pour pouvoir installer des paquets sans
    5.27  connexion Internet.\"
    5.28 @@ -326,7 +326,7 @@
    5.29  			</button>
    5.30  		</hbox>
    5.31  	</vbox>
    5.32 -	
    5.33 +
    5.34  	<vbox>
    5.35  		<tree>
    5.36  			<width>620</width><height>120</height>