tazpkg rev 135
Fix more typos
| author | Mike D. Smith <MikeDSmith25@gmail.com> |
|---|---|
| date | Sun Jul 20 07:42:20 2008 +0000 (2008-07-20) |
| parents | 081c91ac067f |
| children | ceb2dcd87ee1 |
| files | applications/tazpkg.desktop applications/tazpkgbox.desktop lib/tazpkgbox/package_infos lib/tazpkgbox/search tazpkg |
line diff
1.1 --- a/applications/tazpkg.desktop Sat Jul 19 06:04:38 2008 +0000 1.2 +++ b/applications/tazpkg.desktop Sun Jul 20 07:42:20 2008 +0000 1.3 @@ -1,6 +1,6 @@ 1.4 [Desktop Entry] 1.5 Encoding=UTF-8 1.6 -Name=Packages manager (SHell) 1.7 +Name=Package manager (SHell) 1.8 Name[fr]=Gestionnaire de paquets (SHell) 1.9 Comment=Run tazpkg commands in a shell 1.10 Exec=xterm -e 'tazpkg shell'
2.1 --- a/applications/tazpkgbox.desktop Sat Jul 19 06:04:38 2008 +0000 2.2 +++ b/applications/tazpkgbox.desktop Sun Jul 20 07:42:20 2008 +0000 2.3 @@ -1,6 +1,6 @@ 2.4 [Desktop Entry] 2.5 Encoding=UTF-8 2.6 -Name=Packages manager (GUI) 2.7 +Name=Package manager (GUI) 2.8 Name[fr]=Gestionnaire de paquets (GUI) 2.9 Comment=Manage software packages 2.10 Exec=subox tazpkgbox
3.1 --- a/lib/tazpkgbox/package_infos Sat Jul 19 06:04:38 2008 +0000 3.2 +++ b/lib/tazpkgbox/package_infos Sun Jul 20 07:42:20 2008 +0000 3.3 @@ -1,6 +1,6 @@ 3.4 #!/bin/sh 3.5 # 3.6 -# Dialog box to provide package infos and actions 3.7 +# Dialog box to provide package info and actions 3.8 # 3.9 3.10 XTERM_OPTS="-geometry 80x16+120+120"
4.1 --- a/lib/tazpkgbox/search Sat Jul 19 06:04:38 2008 +0000 4.2 +++ b/lib/tazpkgbox/search Sun Jul 20 07:42:20 2008 +0000 4.3 @@ -1,6 +1,6 @@ 4.4 #!/bin/sh 4.5 # 4.6 -# This script provide a suitable output for the search results. 4.7 +# This script provides a suitable output for the search results. 4.8 # 4.9 4.10 # Clean preview results.
5.1 --- a/tazpkg Sat Jul 19 06:04:38 2008 +0000 5.2 +++ b/tazpkg Sun Jul 20 07:42:20 2008 +0000 5.3 @@ -2,9 +2,9 @@ 5.4 # Tazpkg - Tiny autonomus zone packages manager. 5.5 # 5.6 # This is a lightwight packages manager for *.tazpkg files, all written in 5.7 -# SHell script. It works well with Busybox ash shell and bash. Tazpkg let you 5.8 -# list, install, remove, download or get information about a package, you can 5.9 -# use 'tazpkg usage' to get a list of commands with a short description. Tazpkg 5.10 +# SHell script. It works well with Busybox ash shell and bash. Tazpkg lets you 5.11 +# list, install, remove, download or get information about a package. You can 5.12 +# use 'tazpkg usage' to get a list of commands with short descriptions. Tazpkg 5.13 # also resolves dependencies and can upgrade packages from a mirror. 5.14 # 5.15 # (C) 2007-2008 SliTaz - GNU General Public License v3. 5.16 @@ -64,7 +64,7 @@ 5.17 WARNING="\\033[1;31mWARNING\\033[0;39m" 5.18 5.19 # Check if the directories and files used by Tazpkg 5.20 -# exists. If not and user is root we create them. 5.21 +# exist. If not and user is root we create them. 5.22 if test $(id -u) = 0 ; then 5.23 if [ ! -d "$CACHE_DIR" ]; then 5.24 mkdir -p $CACHE_DIR 5.25 @@ -84,17 +84,17 @@ 5.26 # Print the usage. 5.27 usage () 5.28 { 5.29 - echo -e "SliTaz packages manager - Version: $VERSION\n 5.30 + echo -e "SliTaz package manager - Version: $VERSION\n 5.31 \033[1mUsage:\033[0m tazpkg [command] [package|dir|pattern|list|cat|--opt] [dir|--opt] 5.32 tazpkg shell\n 5.33 \033[1mCommands: \033[0m 5.34 usage Print this short usage. 5.35 list List installed packages on the system by category or all. 5.36 - xhtml-list Creates a xHTML list of installed packges. 5.37 + xhtml-list Create a xHTML list of installed packges. 5.38 list-mirror List all available packages on the mirror (--diff for new). 5.39 - info Print informations about the package. 5.40 - desc Print description of a package (if it exist). 5.41 - list-files List of files installed with the package. 5.42 + info Print information about a package. 5.43 + desc Print description of a package (if it exists). 5.44 + list-files List the files installed with a package. 5.45 search Search for a package by pattern or name (options: -i|-l|-m). 5.46 search-file Search for file(s) in all installed packages files. 5.47 install Install a local (*.tazpkg) package (--forced to force). 5.48 @@ -109,7 +109,7 @@ 5.49 get Download a package into the current directory. 5.50 get-install Download and install a package from the mirror. 5.51 get-install-list Download and install a list of packages from the mirror. 5.52 - check Verify installed packages concistancy. 5.53 + check Verify consistency of installed packages. 5.54 add-flavor Install the flavor list of packages. 5.55 install-flavor Install the flavor list of packages and remove other ones. 5.56 set-release Change release and update packages 5.57 @@ -211,8 +211,8 @@ 5.58 else 5.59 echo -e " 5.60 Unable to find the list : $LOCALSTATE/packages.list\n 5.61 -You must probably run 'tazpkg recharge' as root to get the last list of 5.62 -packages avalaible on the mirror.\n" 5.63 +You should probably run 'tazpkg recharge' as root to get the latest list of 5.64 +packages available on the mirror.\n" 5.65 exit 0 5.66 fi 5.67 fi 5.68 @@ -251,12 +251,12 @@ 5.69 cpio -id < fs.cpio && rm fs.cpio 5.70 } 5.71 5.72 -# This function install a package in the rootfs. 5.73 +# This function installs a package in the rootfs. 5.74 install_package() 5.75 { 5.76 ROOT=$1 5.77 if [ -n "$ROOT" ]; then 5.78 - # get absolute path 5.79 + # Get absolute path 5.80 ROOT=$(cd $ROOT; pwd) 5.81 fi 5.82 ( 5.83 @@ -491,7 +491,7 @@ 5.84 _EOT_ 5.85 } 5.86 5.87 -# xHTML content with packages infos. 5.88 +# xHTML content with packages info. 5.89 xhtml_pkg_info() 5.90 { 5.91 cat >> $XHTML_LIST << _EOT_ 5.92 @@ -548,7 +548,7 @@ 5.93 fi 5.94 } 5.95 5.96 -# Search in packages.list for avalaible pkgs. 5.97 +# Search in packages.list for available pkgs. 5.98 search_in_packages_list() 5.99 { 5.100 echo "Available packages name-version" 5.101 @@ -559,7 +559,7 @@ 5.102 else 5.103 echo -e " 5.104 No 'packages.list' found to check for mirrored packages. For more results, 5.105 -please run once 'tazpkg recharge' as root before searching.\n" 5.106 +please run 'tazpkg recharge' once as root before searching.\n" 5.107 fi 5.108 if [ "$packages" = "0" ]; then 5.109 echo "0 available packages found for : $PATTERN" 5.110 @@ -571,8 +571,8 @@ 5.111 fi 5.112 } 5.113 5.114 -# search --mirror: Search in packages.txt for avalaible pkgs and give more 5.115 -# infos than --list or default. 5.116 +# search --mirror: Search in packages.txt for available pkgs and give more 5.117 +# info than --list or default. 5.118 search_in_packages_txt() 5.119 { 5.120 echo "Matching packages name with version and desc" 5.121 @@ -583,7 +583,7 @@ 5.122 else 5.123 echo -e " 5.124 No 'packages.txt' found to check for mirrored packages. For more results, 5.125 -please run once 'tazpkg recharge' as root before searching.\n" 5.126 +please run 'tazpkg recharge' once as root before searching.\n" 5.127 fi 5.128 if [ "$packages" = "0" ]; then 5.129 echo "0 available packages found for : $PATTERN" 5.130 @@ -698,7 +698,7 @@ 5.131 echo -e "$packages packages installed of category $ASKED_CATEGORY." 5.132 echo "" 5.133 else 5.134 - # By default list all packages and version. 5.135 + # By default list all packages and versions. 5.136 echo "" 5.137 echo -e "\033[1mList of all installed packages\033[0m" 5.138 echo "================================================================================" 5.139 @@ -718,7 +718,7 @@ 5.140 fi 5.141 ;; 5.142 xhtml-list) 5.143 - # Get infos in receipts and build list. 5.144 + # Get info in receipts and build list. 5.145 DATE=`date +%Y-%m-%d\ \%H:%M:%S` 5.146 if [ -n "$2" ]; then 5.147 XHTML_LIST=$2 5.148 @@ -732,7 +732,7 @@ 5.149 xhtml_header 5.150 status 5.151 # Packages 5.152 - echo -n "Creating packages informations..." 5.153 + echo -n "Creating packages information..." 5.154 for pkg in $INSTALLED/* 5.155 do 5.156 [ -f $pkg/receipt ] || continue 5.157 @@ -768,7 +768,7 @@ 5.158 echo "" 5.159 else 5.160 echo -e "\nUnable to list anything, no packages.diff found." 5.161 - echo -e "Recharge your current list to creat a first diff.\n" 5.162 + echo -e "Recharge your current list to create a first diff.\n" 5.163 fi && exit 0 ;; 5.164 --text|--txt) 5.165 echo "" 5.166 @@ -808,7 +808,7 @@ 5.167 EXTRAVERSION="" 5.168 . $INSTALLED/$PACKAGE/receipt 5.169 echo "" 5.170 - echo -e "\033[1mTazpkg informations\033[0m 5.171 + echo -e "\033[1mTazpkg information\033[0m 5.172 ================================================================================ 5.173 Package : $PACKAGE 5.174 Version : $VERSION$EXTRAVERSION 5.175 @@ -851,7 +851,7 @@ 5.176 # 5.177 PATTERN="$2" 5.178 if [ -z "$PATTERN" ]; then 5.179 - echo -e "\nPlease specify a pattern or a package name to search." 5.180 + echo -e "\nPlease specify a pattern or package name to search for." 5.181 echo -e "Example : 'tazpkg search paint'.\n" 5.182 exit 0 5.183 fi 5.184 @@ -875,7 +875,7 @@ 5.185 # Search for a file by pattern or name in all files.list. 5.186 # 5.187 if [ -z "$2" ]; then 5.188 - echo -e "\nPlease specify a pattern or a file name to search." 5.189 + echo -e "\nPlease specify a pattern or file name to search for." 5.190 echo -e "Example : 'tazpkg search-file libnss'. \n" 5.191 exit 0 5.192 fi 5.193 @@ -1094,8 +1094,8 @@ 5.194 echo "" 5.195 echo -e "\033[1mExtracting :\033[0m $PACKAGE" 5.196 echo "================================================================================" 5.197 - # If any directory destination is found on the cmdline 5.198 - # we creat one in the current dir using the package name. 5.199 + # If no directory destination is found on the cmdline 5.200 + # we create one in the current dir using the package name. 5.201 if [ -n "$TARGET_DIR" ]; then 5.202 DESTDIR=$TARGET_DIR/$PACKAGE 5.203 else 5.204 @@ -1112,7 +1112,7 @@ 5.205 echo "" 5.206 ;; 5.207 repack) 5.208 - # Creat SliTaz package archive from an installed package. 5.209 + # Create SliTaz package archive from an installed package. 5.210 # 5.211 check_for_package_on_cmdline 5.212 check_for_receipt 5.213 @@ -1177,7 +1177,7 @@ 5.214 echo "" 5.215 ;; 5.216 pack) 5.217 - # Creat SliTaz package archive using cpio and gzip. 5.218 + # Create SliTaz package archive using cpio and gzip. 5.219 # 5.220 check_for_package_on_cmdline 5.221 cd $PACKAGE 5.222 @@ -1188,7 +1188,7 @@ 5.223 echo "" 5.224 echo -e "\033[1mPacking :\033[0m $PACKAGE" 5.225 echo "================================================================================" 5.226 - # Creat files.list with redirecting find outpout. 5.227 + # Create files.list with redirecting find outpout. 5.228 echo -n "Creating the list of files..." && cd fs 5.229 find . -type f -print > ../files.list 5.230 find . -type l -print >> ../files.list 5.231 @@ -1246,7 +1246,7 @@ 5.232 echo -e " 5.233 ================================================================================ 5.234 Last packages.list is ready to use. Note that next time you recharge the list, 5.235 -a list of differencies will be displayed to show new and upgradable packages.\n" 5.236 +a list of differencies will be displayed to show new and upgradeable packages.\n" 5.237 fi 5.238 ;; 5.239 upgrade) 5.240 @@ -1270,7 +1270,7 @@ 5.241 [ -f $pkg/receipt ] || continue 5.242 EXTRAVERSION="" 5.243 . $pkg/receipt 5.244 - # Diplay package name to show that Tazpkg is working... 5.245 + # Display package name to show that Tazpkg is working... 5.246 echo -en "\\033[0G " 5.247 echo -en "\\033[0G$PACKAGE" 5.248 # Skip specified pkgs listed in $LOCALSTATE/blocked-packages.list 5.249 @@ -1292,7 +1292,7 @@ 5.250 VERSION=`echo $VERSION | sed s/'pre'/'.'/` 5.251 NEW_VERSION=`echo $NEW_VERSION | sed 's/[A-Z]\.//'` 5.252 VERSION=`echo $VERSION | sed 's/[A-Z]\.//'` 5.253 - # Compare version. Upgrade are only avalaible for official 5.254 + # Compare version. Upgrade are only available for official 5.255 # packages, so we control de mirror and it should be ok if 5.256 # we just check for egality. 5.257 if [ "$VERSION" != "$NEW_VERSION" ]; then 5.258 @@ -1364,20 +1364,20 @@ 5.259 echo "Or upgrade package at you own risks." 5.260 echo "" 5.261 fi 5.262 - # Ask for upgrade, it can be done an other time. 5.263 + # Ask for upgrade, it can be done another time. 5.264 echo -n "Upgrade now (y/N) ? "; read anser 5.265 if [ ! "$anser" = "y" ]; then 5.266 echo -e "\nExiting. No package upgraded.\n" 5.267 exit 0 5.268 fi 5.269 - # If anser is yes (y). Install all new version. 5.270 + # If anser is yes (y). Install all new versions. 5.271 cat upgradeable-packages.list >> upgradeable-packages.list$$ 5.272 mv -f upgradeable-packages.list$$ upgradeable-packages.list 5.273 yes y | tazpkg get-install-list upgradeable-packages.list 5.274 #rm -f upgradeable-packages.list 5.275 ;; 5.276 check) 5.277 - # check installed packages set. 5.278 + # Check installed packages set. 5.279 # 5.280 check_root 5.281 cd $INSTALLED 5.282 @@ -1465,7 +1465,7 @@ 5.283 echo "" 5.284 ;; 5.285 unblock) 5.286 - # Remove a pkg name to the list of blocked packages. 5.287 + # Remove a pkg name from the list of blocked packages. 5.288 # 5.289 check_root 5.290 check_for_package_on_cmdline 5.291 @@ -1527,7 +1527,7 @@ 5.292 cd $CACHE_DIR 5.293 if [ -f "$PACKAGE.tazpkg" ]; then 5.294 echo "$PACKAGE already in the cache : $CACHE_DIR" 5.295 - # check package download was finished 5.296 + # Check package download was finished 5.297 tail -c 2k $PACKAGE.tazpkg | grep -q 00000000TRAILER || { 5.298 echo "Continue $PACKAGE download" 5.299 download $PACKAGE.tazpkg 5.300 @@ -1567,13 +1567,13 @@ 5.301 echo "================================================================================" 5.302 echo " `cat $MIRROR`" 5.303 echo " 5.304 -Please enter URL of the new mirror (http or ftp). You must specify the complet 5.305 +Please enter URL of the new mirror (http or ftp). You must specify the complete 5.306 address to the directory of the packages and packages.list file." 5.307 echo "" 5.308 echo -n "New mirror URL : " 5.309 read NEW_MIRROR_URL 5.310 if [ "$NEW_MIRROR_URL" = "" ]; then 5.311 - echo "Nothing as been change." 5.312 + echo "Nothing has been changed." 5.313 else 5.314 echo "Setting mirror(s) to : $NEW_MIRROR_URL" 5.315 echo "$NEW_MIRROR_URL" > $LOCALSTATE/mirror 5.316 @@ -1612,7 +1612,7 @@ 5.317 echo "" 5.318 echo -e "\033[1mTazpkg SHell.\033[0m" 5.319 echo "================================================================================" 5.320 - echo "Type 'usage' to list all avalaible commands and 'quit' or 'q' to exit." 5.321 + echo "Type 'usage' to list all available commands or 'quit' or 'q' to exit." 5.322 echo "" 5.323 fi 5.324 while true