SliTaz Repositories

     1.1 --- a/lib/libtazpkgbox	Wed Mar 16 06:04:20 2011 +0100
     1.2 +++ b/lib/libtazpkgbox	Fri Mar 25 17:39:05 2011 +0100
     1.3 @@ -157,7 +157,7 @@
     1.4  				fi
     1.5  			fi	
     1.6  		else
     1.7 -			# Input contain package name, don't refer to Package word as
     1.8 +			# Input contains package name, don't refer to Package word as
     1.9  			# tazpkg can use other languages.
    1.10  			PACKAGE=$(echo $input | sed 's/^.* \(.*\) :.*$/\1/')
    1.11  			ICON=tazpkg

     2.1 --- a/tazpkg	Wed Mar 16 06:04:20 2011 +0100
     2.2 +++ b/tazpkg	Fri Mar 25 17:39:05 2011 +0100
     2.3 @@ -1,12 +1,12 @@
     2.4  #!/bin/sh
     2.5  # Tazpkg - Tiny autonomous zone packages manager.
     2.6  #
     2.7 -# This is a lightwight packages manager for *.tazpkg files, all written in
     2.8 +# This is a lightwight packages manager for *.tazpkg files written in
     2.9  # SHell script. It works well with Busybox ash shell and bash. Tazpkg lets you
    2.10  # list, install, remove, download or get information about a package. You can
    2.11  # use 'tazpkg usage' to get a list of commands with short descriptions. Tazpkg
    2.12  # also resolves dependencies and can upgrade packages from a mirror. I18n is
    2.13 -# done with gettext and eval_gettext, ex:
    2.14 +# done using gettext and eval_gettext, ex:
    2.15  # 	gettext "displayed text"; echo
    2.16  # 	eval_gettext "display \$VARIABLE"; echo
    2.17  # 	echo -e "BOLD `gettext \"i18n message\"`"
    2.18 @@ -107,7 +107,7 @@
    2.19    recharge         `gettext \"Recharge your packages.list from the mirror.\"`
    2.20    repack           `gettext \"Create a package archive from an installed package.\"`
    2.21    repack-config    `gettext \"Create a package archive with configuration files.\"`
    2.22 -  recompress       `gettext \"Rebuild a package with the better compression ratio.\"`
    2.23 +  recompress       `gettext \"Rebuild a package with a better compression ratio.\"`
    2.24    upgrade          `gettext \"Upgrade one or all installed/listed package(s) on the mirror.\"`
    2.25    upgradeable      `gettext \"Build upgradeable packages list quickly.\"`
    2.26    block|unblock    `gettext \"Block an installed package version or unblock it for upgrade.\"`
    2.27 @@ -142,7 +142,7 @@
    2.28  	fi
    2.29  }
    2.30  
    2.31 -# Check if the package (*.tazpkg) exist before installing or extracting.
    2.32 +# Check if the package (*.tazpkg) exists before installing or extracting.
    2.33  check_for_package_file()
    2.34  {
    2.35  	if [ ! -f "$PACKAGE_FILE" ]; then
    2.36 @@ -448,7 +448,7 @@
    2.37  		if grep -q ^pre_depends $TMP_DIR/receipt; then
    2.38  			pre_depends $ROOT
    2.39  		fi
    2.40 -		# keep modifers and file list on upgrade
    2.41 +		# Keep modifers and file list on upgrade
    2.42  		cp $ROOT$INSTALLED/$PACKAGE/modifiers \
    2.43  		   $ROOT$INSTALLED/$PACKAGE/files.list $TMP_DIR 2> /dev/null
    2.44  		rm -rf $ROOT$INSTALLED/$PACKAGE 2> /dev/null
    2.45 @@ -731,7 +731,7 @@
    2.46  	else
    2.47  		echo ""
    2.48  		eval_gettext \
    2.49 -"Leaving dependencies for \$PACKAGE unsolved. The package is installed but
    2.50 +"Leaving dependencies for \$PACKAGE unresolved. The package is installed but
    2.51  will probably not work."; echo
    2.52  		echo ""
    2.53  	fi
    2.54 @@ -929,7 +929,7 @@
    2.55  			tazpkg remove $PACKAGE
    2.56  		done
    2.57  	else
    2.58 -		eval_gettext "Can't find flavor \$FLAVOR. Aborting."; echo
    2.59 +		eval_gettext "Can't find flavor \$FLAVOR. Abort."; echo
    2.60  	fi
    2.61  	cd $TOP_DIR
    2.62  	rm -rf $TMP_DIR
    2.63 @@ -1072,7 +1072,7 @@
    2.64  		done
    2.65  	done
    2.66  	spc=""
    2.67 -	cat $TMP_DIR/depends | sort | uniq | while read file; do
    2.68 +	cat $TMP_DIR/depends 2> /dev/null | sort | uniq | while read file; do
    2.69  		echo -n "$spc$file"
    2.70  		spc=" "
    2.71  	done
    2.72 @@ -1249,11 +1249,11 @@
    2.73  {
    2.74  	mkdir -p $TMP_DIR
    2.75  	dpkg-deb -e $PACKAGE_FILE $TMP_DIR
    2.76 -	package=$(grep '^ *Package' $TMP_DIR/control)
    2.77 +	package=$(grep '^ *Package:' $TMP_DIR/control)
    2.78  	package=$(echo ${package##*:})
    2.79 -	version=$(grep '^ *Version' $TMP_DIR/control)
    2.80 +	version=$(grep '^ *Version:' $TMP_DIR/control)
    2.81  	version=$(echo ${version##*:})
    2.82 -	descrip=$(grep '^ *Description' $TMP_DIR/control)
    2.83 +	descrip=$(grep '^ *Description:' $TMP_DIR/control)
    2.84  	descrip=$(echo ${descrip##*:})
    2.85  	target="$(grep ^Architecture $TMP_DIR/control | sed 's/.*: //')"
    2.86  	case "$target" in
    2.87 @@ -1306,7 +1306,7 @@
    2.88  BEGIN {
    2.89  	goturl=0;
    2.90  	printf "# Taz package receipt.\n";
    2.91 -	printf "# generated by tazpkg from rpm package %s\n",pkg;
    2.92 +	printf "# Generated by tazpkg from rpm package %s\n",pkg;
    2.93  }
    2.94  {
    2.95  	if (/^Name/) { name=$3; printf "PACKAGE=\"%s\"\n",$3; }
    2.96 @@ -1400,9 +1400,9 @@
    2.97  		`gettext "meta"`) echo "meta" ;;
    2.98  		`gettext "non-free"`) echo "non-free" ;;
    2.99  		
   2.100 -		# If gategory isn't one of thoses traduced in native language,
   2.101 -		# keep it untranslated. This allow both native and english
   2.102 -		# language support. This also support custom categories.
   2.103 +		# If category is not one of those translated in native language,
   2.104 +		# keep it untranslated. This allows both native and english
   2.105 +		# language support. This also supports custom categories.
   2.106  		*) echo "$1" ;;
   2.107  		
   2.108  	esac
   2.109 @@ -1687,7 +1687,7 @@
   2.110  
   2.111  		else
   2.112  
   2.113 -		# Check all pkg files.list in search match with specify the package
   2.114 +		# Check all pkg files.list in search match which specify the package
   2.115  		# name and the full path to the file(s).
   2.116  		for pkg in $INSTALLED/*
   2.117  		do
   2.118 @@ -2465,7 +2465,7 @@
   2.119  		# What to do if major or minor version is smaller.
   2.120  		if [ "$FIXE" == "yes" ]; then
   2.121  			gettext \
   2.122 -"WARNING ---> Installed package seems more recent than the mirrored
   2.123 +"WARNING ---> Installed package(s) seem(s) more recent than the mirrored
   2.124  one. You can block packages using the command : 'tazpkg block package'.
   2.125  Or upgrade packages at your own risk."
   2.126  			echo ""
   2.127 @@ -2908,7 +2908,7 @@
   2.128  			cat <<EOT
   2.129  usage:   tazpkg link package_name slitaz_root
   2.130  example: 'tazpkg link openoffice /mnt' will use less than 100k in
   2.131 -         your ram running system.
   2.132 +         your running system ram.
   2.133  EOT
   2.134  			exit 1
   2.135  		fi
   2.136 @@ -2936,7 +2936,7 @@
   2.137  				done
   2.138  			else
   2.139  				echo ""
   2.140 -				eval_gettext "Leaving dependencies for \$PACKAGE unsolved."; echo
   2.141 +				eval_gettext "Leaving dependencies for \$PACKAGE unresolved."; echo
   2.142  				gettext "The package is installed but will probably not work."; echo
   2.143  				echo ""
   2.144  			fi

     3.1 --- a/tazpkgbox-install	Wed Mar 16 06:04:20 2011 +0100
     3.2 +++ b/tazpkgbox-install	Fri Mar 25 17:39:05 2011 +0100
     3.3 @@ -1,7 +1,7 @@
     3.4  #!/bin/sh
     3.5  #
     3.6 -# GTKdialog interface to SliTaz Packages Manager aka Tazpkg. Notes:
     3.7 -# Notebook tab are vbox, tabs are used to indent and functions are
     3.8 +# GTKdialog interface to SliTaz Packages Manager aka Tazpkg. Note:
     3.9 +# Notebook tabs are vbox, tabs are used to indent and functions are
    3.10  # split and found in $LIB.
    3.11  #
    3.12  # (C) GNU gpl v3 - SliTaz GNU/Linux 2010.