SliTaz Repositories

     1.1 --- a/tazpkg	Fri Mar 04 16:00:21 2011 +0100
     1.2 +++ b/tazpkg	Mon Mar 07 15:20:49 2011 +0000
     1.3 @@ -1,12 +1,12 @@
     1.4  #!/bin/sh
     1.5  # Tazpkg - Tiny autonomous zone packages manager.
     1.6  #
     1.7 -# This is a lightwight packages manager for *.tazpkg files, all written in
     1.8 +# This is a lightwight packages manager for *.tazpkg files written in
     1.9  # SHell script. It works well with Busybox ash shell and bash. Tazpkg lets you
    1.10  # list, install, remove, download or get information about a package. You can
    1.11  # use 'tazpkg usage' to get a list of commands with short descriptions. Tazpkg
    1.12  # also resolves dependencies and can upgrade packages from a mirror. I18n is
    1.13 -# done with gettext and eval_gettext, ex:
    1.14 +# done using gettext and eval_gettext, ex:
    1.15  # 	gettext "displayed text"; echo
    1.16  # 	eval_gettext "display \$VARIABLE"; echo
    1.17  # 	echo -e "BOLD `gettext \"i18n message\"`"
    1.18 @@ -107,7 +107,7 @@
    1.19    recharge         `gettext \"Recharge your packages.list from the mirror.\"`
    1.20    repack           `gettext \"Create a package archive from an installed package.\"`
    1.21    repack-config    `gettext \"Create a package archive with configuration files.\"`
    1.22 -  recompress       `gettext \"Rebuild a package with the better compression ratio.\"`
    1.23 +  recompress       `gettext \"Rebuild a package with a better compression ratio.\"`
    1.24    upgrade          `gettext \"Upgrade one or all installed/listed package(s) on the mirror.\"`
    1.25    upgradeable      `gettext \"Build upgradeable packages list quickly.\"`
    1.26    block|unblock    `gettext \"Block an installed package version or unblock it for upgrade.\"`
    1.27 @@ -142,7 +142,7 @@
    1.28  	fi
    1.29  }
    1.30  
    1.31 -# Check if the package (*.tazpkg) exist before installing or extracting.
    1.32 +# Check if the package (*.tazpkg) exists before installing or extracting.
    1.33  check_for_package_file()
    1.34  {
    1.35  	if [ ! -f "$PACKAGE_FILE" ]; then
    1.36 @@ -448,7 +448,7 @@
    1.37  		if grep -q ^pre_depends $TMP_DIR/receipt; then
    1.38  			pre_depends $ROOT
    1.39  		fi
    1.40 -		# keep modifers and file list on upgrade
    1.41 +		# Keep modifers and file list on upgrade
    1.42  		cp $ROOT$INSTALLED/$PACKAGE/modifiers \
    1.43  		   $ROOT$INSTALLED/$PACKAGE/files.list $TMP_DIR 2> /dev/null
    1.44  		rm -rf $ROOT$INSTALLED/$PACKAGE 2> /dev/null
    1.45 @@ -731,7 +731,7 @@
    1.46  	else
    1.47  		echo ""
    1.48  		eval_gettext \
    1.49 -"Leaving dependencies for \$PACKAGE unsolved. The package is installed but
    1.50 +"Leaving dependencies for \$PACKAGE unresolved. The package is installed but
    1.51  will probably not work."; echo
    1.52  		echo ""
    1.53  	fi
    1.54 @@ -929,7 +929,7 @@
    1.55  			tazpkg remove $PACKAGE
    1.56  		done
    1.57  	else
    1.58 -		eval_gettext "Can't find flavor \$FLAVOR. Aborting."; echo
    1.59 +		eval_gettext "Can't find flavor \$FLAVOR. Abort."; echo
    1.60  	fi
    1.61  	cd $TOP_DIR
    1.62  	rm -rf $TMP_DIR
    1.63 @@ -1306,7 +1306,7 @@
    1.64  BEGIN {
    1.65  	goturl=0;
    1.66  	printf "# Taz package receipt.\n";
    1.67 -	printf "# generated by tazpkg from rpm package %s\n",pkg;
    1.68 +	printf "# Generated by tazpkg from rpm package %s\n",pkg;
    1.69  }
    1.70  {
    1.71  	if (/^Name/) { name=$3; printf "PACKAGE=\"%s\"\n",$3; }
    1.72 @@ -1400,9 +1400,9 @@
    1.73  		`gettext "meta"`) echo "meta" ;;
    1.74  		`gettext "non-free"`) echo "non-free" ;;
    1.75  		
    1.76 -		# If gategory isn't one of thoses traduced in native language,
    1.77 -		# keep it untranslated. This allow both native and english
    1.78 -		# language support. This also support custom categories.
    1.79 +		# If category is not one of those translated in native language,
    1.80 +		# keep it untranslated. This allows both native and english
    1.81 +		# language support. This also supports custom categories.
    1.82  		*) echo "$1" ;;
    1.83  		
    1.84  	esac
    1.85 @@ -1687,7 +1687,7 @@
    1.86  
    1.87  		else
    1.88  
    1.89 -		# Check all pkg files.list in search match with specify the package
    1.90 +		# Check all pkg files.list in search match which specify the package
    1.91  		# name and the full path to the file(s).
    1.92  		for pkg in $INSTALLED/*
    1.93  		do
    1.94 @@ -2415,7 +2415,7 @@
    1.95  		# What to do if major or minor version is smaller.
    1.96  		if [ "$FIXE" == "yes" ]; then
    1.97  			gettext \
    1.98 -"WARNING ---> Installed package seems more recent than the mirrored
    1.99 +"WARNING ---> Installed package(s) seem(s) more recent than the mirrored
   1.100  one. You can block packages using the command : 'tazpkg block package'.
   1.101  Or upgrade packages at your own risk."
   1.102  			echo ""
   1.103 @@ -2846,7 +2846,7 @@
   1.104  			cat <<EOT
   1.105  usage:   tazpkg link package_name slitaz_root
   1.106  example: 'tazpkg link openoffice /mnt' will use less than 100k in
   1.107 -         your ram running system.
   1.108 +         your running system ram.
   1.109  EOT
   1.110  			exit 1
   1.111  		fi
   1.112 @@ -2874,7 +2874,7 @@
   1.113  				done
   1.114  			else
   1.115  				echo ""
   1.116 -				eval_gettext "Leaving dependencies for \$PACKAGE unsolved."; echo
   1.117 +				eval_gettext "Leaving dependencies for \$PACKAGE unresolved."; echo
   1.118  				gettext "The package is installed but will probably not work."; echo
   1.119  				echo ""
   1.120  			fi