tazpkg rev 437
Tiny edits
author | Paul Issott <paul@slitaz.org> |
---|---|
date | Mon Mar 07 15:20:49 2011 +0000 (2011-03-07) |
parents | f6c402b4d86b |
children | 2784093ebf38 |
files | lib/libtazpkgbox tazpkg tazpkgbox-install |
line diff
1.1 --- a/lib/libtazpkgbox Fri Mar 04 16:00:21 2011 +0100 1.2 +++ b/lib/libtazpkgbox Mon Mar 07 15:20:49 2011 +0000 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 Fri Mar 04 16:00:21 2011 +0100 2.2 +++ b/tazpkg Mon Mar 07 15:20:49 2011 +0000 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 @@ -1306,7 +1306,7 @@ 2.64 BEGIN { 2.65 goturl=0; 2.66 printf "# Taz package receipt.\n"; 2.67 - printf "# generated by tazpkg from rpm package %s\n",pkg; 2.68 + printf "# Generated by tazpkg from rpm package %s\n",pkg; 2.69 } 2.70 { 2.71 if (/^Name/) { name=$3; printf "PACKAGE=\"%s\"\n",$3; } 2.72 @@ -1400,9 +1400,9 @@ 2.73 `gettext "meta"`) echo "meta" ;; 2.74 `gettext "non-free"`) echo "non-free" ;; 2.75 2.76 - # If gategory isn't one of thoses traduced in native language, 2.77 - # keep it untranslated. This allow both native and english 2.78 - # language support. This also support custom categories. 2.79 + # If category is not one of those translated in native language, 2.80 + # keep it untranslated. This allows both native and english 2.81 + # language support. This also supports custom categories. 2.82 *) echo "$1" ;; 2.83 2.84 esac 2.85 @@ -1687,7 +1687,7 @@ 2.86 2.87 else 2.88 2.89 - # Check all pkg files.list in search match with specify the package 2.90 + # Check all pkg files.list in search match which specify the package 2.91 # name and the full path to the file(s). 2.92 for pkg in $INSTALLED/* 2.93 do 2.94 @@ -2415,7 +2415,7 @@ 2.95 # What to do if major or minor version is smaller. 2.96 if [ "$FIXE" == "yes" ]; then 2.97 gettext \ 2.98 -"WARNING ---> Installed package seems more recent than the mirrored 2.99 +"WARNING ---> Installed package(s) seem(s) more recent than the mirrored 2.100 one. You can block packages using the command : 'tazpkg block package'. 2.101 Or upgrade packages at your own risk." 2.102 echo "" 2.103 @@ -2846,7 +2846,7 @@ 2.104 cat <<EOT 2.105 usage: tazpkg link package_name slitaz_root 2.106 example: 'tazpkg link openoffice /mnt' will use less than 100k in 2.107 - your ram running system. 2.108 + your running system ram. 2.109 EOT 2.110 exit 1 2.111 fi 2.112 @@ -2874,7 +2874,7 @@ 2.113 done 2.114 else 2.115 echo "" 2.116 - eval_gettext "Leaving dependencies for \$PACKAGE unsolved."; echo 2.117 + eval_gettext "Leaving dependencies for \$PACKAGE unresolved."; echo 2.118 gettext "The package is installed but will probably not work."; echo 2.119 echo "" 2.120 fi
3.1 --- a/tazpkgbox-install Fri Mar 04 16:00:21 2011 +0100 3.2 +++ b/tazpkgbox-install Mon Mar 07 15:20:49 2011 +0000 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.