# HG changeset patch # User Antoine Bodin # Date 1301071145 -3600 # Node ID f8a1a260f8111d2fe7fab8c2755441c53fb817a5 # Parent 14dfaa59ca7f24e3ca7504be0d0d2cf61be32fb0# Parent 2784093ebf38aed33d3794bd62291bbcc6191075 Merge changes from default branch diff -r 14dfaa59ca7f -r f8a1a260f811 lib/libtazpkgbox --- a/lib/libtazpkgbox Wed Mar 16 06:04:20 2011 +0100 +++ b/lib/libtazpkgbox Fri Mar 25 17:39:05 2011 +0100 @@ -157,7 +157,7 @@ fi fi else - # Input contain package name, don't refer to Package word as + # Input contains package name, don't refer to Package word as # tazpkg can use other languages. PACKAGE=$(echo $input | sed 's/^.* \(.*\) :.*$/\1/') ICON=tazpkg diff -r 14dfaa59ca7f -r f8a1a260f811 tazpkg --- a/tazpkg Wed Mar 16 06:04:20 2011 +0100 +++ b/tazpkg Fri Mar 25 17:39:05 2011 +0100 @@ -1,12 +1,12 @@ #!/bin/sh # Tazpkg - Tiny autonomous zone packages manager. # -# This is a lightwight packages manager for *.tazpkg files, all written in +# This is a lightwight packages manager for *.tazpkg files written in # SHell script. It works well with Busybox ash shell and bash. Tazpkg lets you # list, install, remove, download or get information about a package. You can # use 'tazpkg usage' to get a list of commands with short descriptions. Tazpkg # also resolves dependencies and can upgrade packages from a mirror. I18n is -# done with gettext and eval_gettext, ex: +# done using gettext and eval_gettext, ex: # gettext "displayed text"; echo # eval_gettext "display \$VARIABLE"; echo # echo -e "BOLD `gettext \"i18n message\"`" @@ -107,7 +107,7 @@ recharge `gettext \"Recharge your packages.list from the mirror.\"` repack `gettext \"Create a package archive from an installed package.\"` repack-config `gettext \"Create a package archive with configuration files.\"` - recompress `gettext \"Rebuild a package with the better compression ratio.\"` + recompress `gettext \"Rebuild a package with a better compression ratio.\"` upgrade `gettext \"Upgrade one or all installed/listed package(s) on the mirror.\"` upgradeable `gettext \"Build upgradeable packages list quickly.\"` block|unblock `gettext \"Block an installed package version or unblock it for upgrade.\"` @@ -142,7 +142,7 @@ fi } -# Check if the package (*.tazpkg) exist before installing or extracting. +# Check if the package (*.tazpkg) exists before installing or extracting. check_for_package_file() { if [ ! -f "$PACKAGE_FILE" ]; then @@ -448,7 +448,7 @@ if grep -q ^pre_depends $TMP_DIR/receipt; then pre_depends $ROOT fi - # keep modifers and file list on upgrade + # Keep modifers and file list on upgrade cp $ROOT$INSTALLED/$PACKAGE/modifiers \ $ROOT$INSTALLED/$PACKAGE/files.list $TMP_DIR 2> /dev/null rm -rf $ROOT$INSTALLED/$PACKAGE 2> /dev/null @@ -731,7 +731,7 @@ else echo "" eval_gettext \ -"Leaving dependencies for \$PACKAGE unsolved. The package is installed but +"Leaving dependencies for \$PACKAGE unresolved. The package is installed but will probably not work."; echo echo "" fi @@ -929,7 +929,7 @@ tazpkg remove $PACKAGE done else - eval_gettext "Can't find flavor \$FLAVOR. Aborting."; echo + eval_gettext "Can't find flavor \$FLAVOR. Abort."; echo fi cd $TOP_DIR rm -rf $TMP_DIR @@ -1072,7 +1072,7 @@ done done spc="" - cat $TMP_DIR/depends | sort | uniq | while read file; do + cat $TMP_DIR/depends 2> /dev/null | sort | uniq | while read file; do echo -n "$spc$file" spc=" " done @@ -1249,11 +1249,11 @@ { mkdir -p $TMP_DIR dpkg-deb -e $PACKAGE_FILE $TMP_DIR - package=$(grep '^ *Package' $TMP_DIR/control) + package=$(grep '^ *Package:' $TMP_DIR/control) package=$(echo ${package##*:}) - version=$(grep '^ *Version' $TMP_DIR/control) + version=$(grep '^ *Version:' $TMP_DIR/control) version=$(echo ${version##*:}) - descrip=$(grep '^ *Description' $TMP_DIR/control) + descrip=$(grep '^ *Description:' $TMP_DIR/control) descrip=$(echo ${descrip##*:}) target="$(grep ^Architecture $TMP_DIR/control | sed 's/.*: //')" case "$target" in @@ -1306,7 +1306,7 @@ BEGIN { goturl=0; printf "# Taz package receipt.\n"; - printf "# generated by tazpkg from rpm package %s\n",pkg; + printf "# Generated by tazpkg from rpm package %s\n",pkg; } { if (/^Name/) { name=$3; printf "PACKAGE=\"%s\"\n",$3; } @@ -1400,9 +1400,9 @@ `gettext "meta"`) echo "meta" ;; `gettext "non-free"`) echo "non-free" ;; - # If gategory isn't one of thoses traduced in native language, - # keep it untranslated. This allow both native and english - # language support. This also support custom categories. + # If category is not one of those translated in native language, + # keep it untranslated. This allows both native and english + # language support. This also supports custom categories. *) echo "$1" ;; esac @@ -1687,7 +1687,7 @@ else - # Check all pkg files.list in search match with specify the package + # Check all pkg files.list in search match which specify the package # name and the full path to the file(s). for pkg in $INSTALLED/* do @@ -2465,7 +2465,7 @@ # What to do if major or minor version is smaller. if [ "$FIXE" == "yes" ]; then gettext \ -"WARNING ---> Installed package seems more recent than the mirrored +"WARNING ---> Installed package(s) seem(s) more recent than the mirrored one. You can block packages using the command : 'tazpkg block package'. Or upgrade packages at your own risk." echo "" @@ -2908,7 +2908,7 @@ cat <