tazpkg diff tazpkg @ rev 633
Add Polish translation (thanks Pawel Pyrczak); merge tazpkg, tazpkg-notify and other *pkg* translations into one; simplify plural translations using $num; normalize name (Tazpkg, TazPKG -> TazPkg); move markup outside translations; re-use categories names in tazpkg and tazpanel; other tiny improvements.
| author | Aleksej Bobylev <al.bobylev@gmail.com> |
|---|---|
| date | Thu Jul 25 01:47:48 2013 +0300 (2013-07-25) |
| parents | 85d62a4756ce |
| children | 0b0d46647d1a |
line diff
1.1 --- a/tazpkg Tue Jul 16 08:53:33 2013 +0200 1.2 +++ b/tazpkg Thu Jul 25 01:47:48 2013 +0300 1.3 @@ -1,22 +1,22 @@ 1.4 #!/bin/sh 1.5 -# Tazpkg - Tiny autonomous zone packages manager. 1.6 +# TazPkg - Tiny autonomous zone packages manager. 1.7 # 1.8 # This is a lightwight packages manager for *.tazpkg files written in SHell 1.9 -# script. It works well with Busybox ash shell and bash. Tazpkg lets you 1.10 +# script. It works well with Busybox ash shell and bash. TazPkg lets you 1.11 # list, install, remove, download or get information about a package. You can 1.12 -# use 'tazpkg usage' to get a list of commands with short descriptions. Tazpkg 1.13 +# use 'tazpkg usage' to get a list of commands with short descriptions. TazPkg 1.14 # also resolves dependencies and can upgrade packages from a mirror. 1.15 # 1.16 -# (C) 2007-2012 SliTaz - GNU General Public License v3. 1.17 +# (C) 2007-2013 SliTaz - GNU General Public License v3. 1.18 # 1.19 -# Authors : See the AUTHORS files 1.20 +# Authors: See the AUTHORS files 1.21 # 1.22 1.23 #################### 1.24 # Script variables # 1.25 #################### 1.26 1.27 -# TazPKG version 1.28 +# TazPkg version 1.29 VERSION=5.1 1.30 1.31 . /etc/slitaz/slitaz.conf 1.32 @@ -56,7 +56,7 @@ 1.33 } 1.34 1.35 # 1.36 -# Tazpkg output functions 1.37 +# TazPkg output functions 1.38 # 1.39 # Print localized title 1.40 title() { newline; boldify "$(eval_gettext "$1")"; separator; } 1.41 @@ -160,7 +160,8 @@ 1.42 1.43 usage_up() { 1.44 cat << EOT 1.45 -$(emsg "$(gettext '<b>Tazpkg usage for command up:</b> tazpkg up [--option]')") 1.46 +$(emsg "<b>$(gettext 'TazPkg usage for command up:')</b>") 1.47 + tazpkg up [$(gettext 'option')] 1.48 * $(gettext 'Without options run in interactive mode and ask before install') 1.49 1.50 $(boldify "$(gettext 'Where options are:')") 1.51 @@ -186,7 +187,7 @@ 1.52 fi 1.53 } 1.54 1.55 -# Check if the directories and files used by Tazpkg 1.56 +# Check if the directories and files used by TazPkg 1.57 # exist. If not and user is root we create them. 1.58 check_base_dir() 1.59 { 1.60 @@ -227,10 +228,10 @@ 1.61 # Check for the receipt of an installed package. 1.62 check_for_receipt() 1.63 { 1.64 - if [ ! -f "$1$INSTALLED/$PACKAGE/receipt" ]; then 1.65 - FS=$1 1.66 + receipt_path="$1$INSTALLED/$PACKAGE/receipt" 1.67 + if [ ! -f $receipt_path ]; then 1.68 newline 1.69 - eval_gettext "Unable to find the receipt: \$FS\$INSTALLED/\$PACKAGE/receipt"; echo 1.70 + eval_gettext 'Unable to find the receipt: $receipt_path'; echo 1.71 newline 1.72 exit 0 1.73 fi 1.74 @@ -238,7 +239,7 @@ 1.75 1.76 # Get repositories priority using $LOCALSTATE/priority. 1.77 # In this files, undigest are called by their name and main mirror 1.78 -# by main. Sort order : priority 1.79 +# by main. Sort order: priority 1.80 look_for_priority() 1.81 { 1.82 [ -s $LOCALSTATE/priority ] && priority=$(cat $LOCALSTATE/priority) 1.83 @@ -284,8 +285,9 @@ 1.84 { 1.85 if [ -n "$(get_installed_package_pathname $PACKAGE $1)" ]; then 1.86 newline 1.87 - eval_gettext "\$PACKAGE package is already installed. You can 1.88 -use the --forced option to force installation or remove it and reinstall."; echo 1.89 + eval_gettext "\$PACKAGE package is already installed. 1.90 +You can use the --forced option to force installation or remove it 1.91 +and reinstall."; echo 1.92 newline 1.93 exit 0 1.94 fi 1.95 @@ -294,12 +296,13 @@ 1.96 # Check for packages.list to download and install packages. 1.97 check_for_packages_list() 1.98 { 1.99 - if [ ! -f "$LOCALSTATE/packages.list" ]; then 1.100 + list_path="$LOCALSTATE/packages.list" 1.101 + if [ ! -f "$list_path" ]; then 1.102 if test $(id -u) = 0 ; then 1.103 tazpkg recharge 1.104 else 1.105 newline 1.106 - eval_gettext "Unable to find the list: \$LOCALSTATE/packages.list"; echo 1.107 + eval_gettext 'Unable to find the list: $list_path'; echo 1.108 gettext \ 1.109 "You must probably run 'tazpkg recharge' as root to get the latest list of 1.110 packages available on the mirror."; echo 1.111 @@ -562,7 +565,8 @@ 1.112 action "Checking post install dependencies..." 1.113 [ -f $INSTALLED/$PACKAGE/receipt ] 1.114 if ! status; then 1.115 - eval_gettext "Please run 'tazpkg install \$PACKAGE_FILE' in / and retry."; echo 1.116 + command="tazpkg install $PACKAGE_FILE" 1.117 + eval_gettext "Please run '\$command' in / and retry."; echo 1.118 rm -rf $TMP_DIR 1.119 exit 1 1.120 fi 1.121 @@ -690,7 +694,8 @@ 1.122 updatedepmod=yes 1.123 fi 1.124 cd $TOP_DIR 1.125 - footer "$(eval_gettext '$PACKAGE ($VERSION$EXTRAVERSION) is installed.')" 1.126 + pkg_name="$PACKAGE ($VERSION$EXTRAVERSION)" 1.127 + footer "$(eval_gettext '$pkg_name is installed.')" 1.128 # Log this activity 1.129 [ -n "$ROOT" ] || log_pkg Installed 1.130 } 1.131 @@ -733,19 +738,21 @@ 1.132 . $TMP_DIR/receipt 1.133 PACKAGE=$saved 1.134 rm -rf $TMP_DIR 1.135 + 1.136 + num=0 1.137 for pkgorg in $DEPENDS 1.138 do 1.139 i=$(equivalent_pkg $pkgorg $1) 1.140 if [ ! -d "$1$INSTALLED/$i" ]; then 1.141 MISSING_PACKAGE=$i 1.142 - deps=$(($deps+1)) 1.143 + num=$(($num+1)) 1.144 elif [ ! -f "$1$INSTALLED/$i/receipt" ]; then 1.145 eval_gettext "WARNING Dependency loop between \$PACKAGE and \$i."; echo 1.146 fi 1.147 done 1.148 + 1.149 if [ ! "$MISSING_PACKAGE" = "" ]; then 1.150 - emsg "$(eval_gettext '<b>Tracking dependencies for:</b> $PACKAGE')" 1.151 - separator 1.152 + title "$(eval_gettext 'Tracking dependencies for: $PACKAGE')" 1.153 for pkgorg in $DEPENDS 1.154 do 1.155 i=$(equivalent_pkg $pkgorg $1) 1.156 @@ -756,8 +763,8 @@ 1.157 done 1.158 separator 1.159 eval_ngettext \ 1.160 - "\$deps missing package to install." \ 1.161 - "\$deps missing packages to install." $deps; echo 1.162 + "\$num missing package to install." \ 1.163 + "\$num missing packages to install." $num; echo 1.164 fi 1.165 } 1.166 1.167 @@ -828,22 +835,23 @@ 1.168 gettext "Installed packages"; echo 1.169 separator 1.170 list=`ls -1 $INSTALLED | grep -i "$PATTERN"` 1.171 + num=0 1.172 for pkg in $list 1.173 do 1.174 EXTRAVERSION="" 1.175 [ -f $INSTALLED/$pkg/receipt ] || continue 1.176 . $INSTALLED/$pkg/receipt 1.177 emsg "$PACKAGE<i 24> $VERSION$EXTRAVERSION<i 42> $(gettext $CATEGORY)" 1.178 - packages=$(($packages+1)) 1.179 + num=$(($num+1)) 1.180 done 1.181 # Set correct ending messages. 1.182 - if [ "$packages" = "" ]; then 1.183 - eval_gettext "0 installed packages found for: \$PATTERN"; echo 1.184 + if [ x$num == x ]; then 1.185 + eval_gettext "No installed packages found for: \$PATTERN"; echo 1.186 newline 1.187 else 1.188 footer "$(eval_ngettext \ 1.189 - '$packages installed package found for: $PATTERN' \ 1.190 - '$packages installed packages found for: $PATTERN' $packages)" 1.191 + '$num installed package found for: $PATTERN' \ 1.192 + '$num installed packages found for: $PATTERN' $num)" 1.193 fi 1.194 } 1.195 1.196 @@ -852,10 +860,10 @@ 1.197 { 1.198 gettext "Available packages name-version"; echo 1.199 separator 1.200 - packages=0 1.201 + num=0 1.202 for i in $LOCALSTATE/packages.list $LOCALSTATE/undigest/*/packages.list; do 1.203 grep -is "$PATTERN" $i 1.204 - packages=$(($packages + `grep -is "$PATTERN" $i | wc -l`)) 1.205 + num=$(($num + `grep -is "$PATTERN" $i | wc -l`)) 1.206 done 1.207 if [ ! -f "$LOCALSTATE/packages.list" ]; then 1.208 newline 1.209 @@ -864,13 +872,13 @@ 1.210 please run 'tazpkg recharge' once as root before searching."; echo 1.211 newline 1.212 fi 1.213 - if [ "$packages" = "0" ]; then 1.214 - eval_gettext "0 available packages found for: \$PATTERN"; echo 1.215 + if [ "$num" = "0" ]; then 1.216 + eval_gettext "No available packages found for: \$PATTERN"; echo 1.217 newline 1.218 else 1.219 footer "$(eval_ngettext \ 1.220 - '$packages available package found for: $PATTERN' \ 1.221 - '$packages available packages found for: $PATTERN' $packages)" 1.222 + '$num available package found for: $PATTERN' \ 1.223 + '$num available packages found for: $PATTERN' $packages)" 1.224 fi 1.225 } 1.226 1.227 @@ -880,10 +888,10 @@ 1.228 { 1.229 gettext "Matching packages name with version and desc"; echo 1.230 separator 1.231 - packages=0 1.232 + num=0 1.233 for i in $LOCALSTATE/packages.txt $LOCALSTATE/undigest/*/packages.txt; do 1.234 grep -is -A 2 "^$PATTERN" $i 1.235 - packages=$(($packages + `grep -is "^$PATTERN" $i | wc -l`)) 1.236 + num=$(($num + `grep -is "^$PATTERN" $i | wc -l`)) 1.237 done 1.238 if [ ! -f "$LOCALSTATE/packages.txt" ]; then 1.239 newline 1.240 @@ -892,13 +900,13 @@ 1.241 please run 'tazpkg recharge' once as root before searching."; echo 1.242 newline 1.243 fi 1.244 - if [ "$packages" = "0" ]; then 1.245 - eval_gettext "0 available packages found for: \$PATTERN"; echo 1.246 + if [ "$num" = "0" ]; then 1.247 + eval_gettext "No available packages found for: \$PATTERN"; echo 1.248 newline 1.249 else 1.250 footer "$(eval_ngettext \ 1.251 - '$packages available package found for: $PATTERN' \ 1.252 - '$packages available packages found for: $PATTERN' $packages)" 1.253 + '$num available package found for: $PATTERN' \ 1.254 + '$num available packages found for: $PATTERN' $packages)" 1.255 fi 1.256 } 1.257 1.258 @@ -1415,7 +1423,7 @@ 1.259 } 1.260 1.261 ################### 1.262 -# Tazpkg commands # 1.263 +# TazPkg commands # 1.264 ################### 1.265 1.266 case "$COMMAND" in 1.267 @@ -1434,14 +1442,13 @@ 1.268 # Display the list of categories. 1.269 if [ "$1" = "cat" -o "$1" = "categories" ]; then 1.270 title 'Packages categories' 1.271 + num=0 1.272 for i in $PKGS_CATEGORIES 1.273 do 1.274 gettext $i; echo 1.275 - categories=$(($categories+1)) 1.276 + num=$(($num+1)) 1.277 done 1.278 - footer "$(eval_ngettext \ 1.279 - '$categories category' \ 1.280 - '$categories categories' $categories)"; echo 1.281 + footer "$(eval_ngettext '$num category' '$num categories' $num)"; echo 1.282 exit 0 1.283 fi 1.284 # Check for an asked category. 1.285 @@ -1459,9 +1466,10 @@ 1.286 packages=$(($packages+1)) 1.287 fi 1.288 done 1.289 + num="<c 32>$packages</c>"; cat_name="<c 34>$ASKED_CATEGORY_I18N</c>" 1.290 footer "$(emsg $(eval_ngettext \ 1.291 - '<c 32>$packages</c> package installed of category <c 34>$ASKED_CATEGORY_I18N</c>.' \ 1.292 - '<c 32>$packages</c> packages installed of category <c 34>$ASKED_CATEGORY_I18N</c>.' \ 1.293 + '$num package installed of category $cat_name.' \ 1.294 + '$num packages installed of category $cat_name.' \ 1.295 $packages))"; echo 1.296 else 1.297 # By default list all packages and versions. 1.298 @@ -1471,12 +1479,13 @@ 1.299 [ -f $pkg/receipt ] || continue 1.300 EXTRAVERSION="" 1.301 . $pkg/receipt 1.302 - echo -e "$PACKAGE\033[24G $VERSION$EXTRAVERSION\033[42G $(gettext $CATEGORY)" 1.303 + echo -e "$PACKAGE\033[35G $VERSION$EXTRAVERSION\033[53G $(gettext $CATEGORY)" 1.304 packages=$(($packages+1)) 1.305 done 1.306 + num="<c 32>$packages</c>" 1.307 footer "$(emsg $(eval_ngettext \ 1.308 - '<c 32>$packages</c> <b>package installed.</b>' \ 1.309 - '<c 32>$packages</c> <b>packages installed.</b>' $packages))" 1.310 + '$num package installed.' \ 1.311 + '$num packages installed.' $packages))" 1.312 fi ;; 1.313 list-mirror|-lm) 1.314 # List all available packages on the mirror. Option --diff displays 1.315 @@ -1487,10 +1496,10 @@ 1.316 if [ -f "$LOCALSTATE/packages.diff" ]; then 1.317 title 'Mirrored packages diff' 1.318 cat $LOCALSTATE/packages.diff 1.319 - pkgs=`cat $LOCALSTATE/packages.diff | wc -l` 1.320 + num=$(cat $LOCALSTATE/packages.diff | wc -l) 1.321 footer "$(eval_ngettext \ 1.322 - '$pkgs new package listed on the mirror.' \ 1.323 - '$pkgs new packages listed on the mirror.' $pkgs)" 1.324 + '$num new package listed on the mirror.' \ 1.325 + '$num new packages listed on the mirror.' $num)" 1.326 else 1.327 newline 1.328 gettext "Unable to list anything, no packages.diff found."; echo 1.329 @@ -1502,9 +1511,10 @@ 1.330 cat $LOCALSTATE/packages.txt ;; 1.331 esac 1.332 pkgs=$(cat $LOCALSTATE/packages.list | wc -l) 1.333 - footer "$(emsg $(eval_ngettext \ 1.334 - '<c 32>$pkgs</c> package in the last recharged list.' \ 1.335 - '<c 32>$pkgs</c> packages in the last recharged list.' $pkgs))" 1.336 + num=$(emsg "<c 32>$pkgs</c>") 1.337 + footer "$(eval_ngettext \ 1.338 + '$num package in the last recharged list.' \ 1.339 + '$num packages in the last recharged list.' $pkgs)" 1.340 ;; 1.341 list-files|-lf) 1.342 # List files installed with the package. 1.343 @@ -1513,9 +1523,10 @@ 1.344 title 'Installed files by: $PACKAGE' 1.345 cat $INSTALLED/$PACKAGE/files.list | sort 1.346 files=$(cat $INSTALLED/$PACKAGE/files.list | wc -l) 1.347 - footer "$(emsg $(eval_ngettext \ 1.348 - '<c 32>$files</c> file installed with $PACKAGE' \ 1.349 - '<c 32>$files</c> files installed with $PACKAGE' $files))" 1.350 + num=$(emsg "<c 32>$files</c>") 1.351 + footer "$(eval_ngettext \ 1.352 + '$num file installed with $PACKAGE' \ 1.353 + '$num files installed with $PACKAGE' $files)" 1.354 ;; 1.355 info) 1.356 # Information about package. 1.357 @@ -1523,7 +1534,7 @@ 1.358 check_for_receipt 1.359 EXTRAVERSION="" 1.360 . $INSTALLED/$PACKAGE/receipt 1.361 - title 'Tazpkg information' 1.362 + title 'TazPkg information' 1.363 # Display localized short description 1.364 if [ -e "$LOCALSTATE/packages-desc.$LANG" ]; then 1.365 LOCDESC=$(grep -e "^$PACKAGE " $LOCALSTATE/packages-desc.$LANG | cut -d' ' -f2) 1.366 @@ -1560,7 +1571,7 @@ 1.367 if [ -z "$PATTERN" ]; then 1.368 newline 1.369 gettext "Please specify a pattern or package name to search for."; echo 1.370 - gettext "Example : 'tazpkg search paint'"; echo 1.371 + echo "$(gettext 'Example:') 'tazpkg search paint'" 1.372 newline 1.373 exit 0 1.374 fi 1.375 @@ -1582,7 +1593,7 @@ 1.376 if [ -z "$2" ]; then 1.377 newline 1.378 gettext "Please specify a pattern or file name to search for."; echo 1.379 - gettext "Example : 'tazpkg search-file libnss'"; echo 1.380 + echo "$(gettext 'Example:') 'tazpkg search-file libnss'" 1.381 newline 1.382 exit 0 1.383 fi 1.384 @@ -1630,9 +1641,10 @@ 1.385 if [ "$match" = "" ]; then 1.386 eval_gettext "0 file found for: \$pkg"; echo 1.387 else 1.388 + num=$(emsg "<c 32>$files</c>") 1.389 footer "$(eval_ngettext \ 1.390 - '$match file found for: $pkg' \ 1.391 - '$match files found for: $pkg' $match)" 1.392 + '$num file found for: $pkg' \ 1.393 + '$num files found for: $pkg' $match)" 1.394 fi 1.395 ;; 1.396 search-pkgname) 1.397 @@ -1640,7 +1652,7 @@ 1.398 if [ -z "$2" ]; then 1.399 newline 1.400 gettext "Please specify a pattern or file name to search for."; echo 1.401 - gettext "Example : 'tazpkg search-pkgname libnss'"; echo 1.402 + echo "$(gettext 'Example:') 'tazpkg search-pkgname libnss'" 1.403 newline 1.404 exit 0 1.405 fi 1.406 @@ -1657,12 +1669,13 @@ 1.407 done 1.408 file=$2 1.409 if [ "$match" = "0" ]; then 1.410 - eval_gettext "0 file found for: \$file"; echo 1.411 + eval_gettext "No file found for: \$file"; echo 1.412 newline 1.413 else 1.414 + num=$(emsg "<c 32>$files</c>") 1.415 footer "$(eval_ngettext \ 1.416 - '$match package found with file: $file' \ 1.417 - '$match packages found with file: $file' $match)" 1.418 + '$num package found with file: $file' \ 1.419 + '$num packages found with file: $file' $match)" 1.420 fi 1.421 ;; 1.422 install|-i) 1.423 @@ -1755,7 +1768,7 @@ 1.424 if [ -z "$RELEASE" ]; then 1.425 newline 1.426 gettext "Please specify the release you want on the command line."; echo 1.427 - gettext "Example: tazpkg set-release cooking"; echo 1.428 + echo "$(gettext 'Example:') tazpkg set-release cooking" 1.429 newline 1.430 exit 0 1.431 fi 1.432 @@ -2204,9 +2217,10 @@ 1.433 cat packages.diff 1.434 new_pkgs=`cat packages.diff | wc -l` 1.435 if [ "$new_pkgs" != 0 ]; then 1.436 + num=$(emsg "<c 32>$new_pkgs</c>") 1.437 footer "$(eval_ngettext \ 1.438 - '$new_pkgs new package on the mirror.' \ 1.439 - '$new_pkgs new packages on the mirror.' $new_pkgs)" 1.440 + '$num new package on the mirror.' \ 1.441 + '$num new packages on the mirror.' $new_pkgs)" 1.442 else 1.443 gettext "No new packages on the mirror."; echo 1.444 newline 1.445 @@ -2307,17 +2321,19 @@ 1.446 gettext "System is up-to-date..."; echo 1.447 newline 1.448 fi 1.449 + num=$(emsg "<c 32>$new_pkgs</c>") 1.450 footer "$(eval_ngettext \ 1.451 - '$pkgs installed package scanned in ${time}s' \ 1.452 - '$pkgs installed packages scanned in ${time}s' $pkgs)" 1.453 + '$num installed package scanned in ${time}s' \ 1.454 + '$num installed packages scanned in ${time}s' $pkgs)" 1.455 if [ "$upnb" != 0 ]; then 1.456 if [ "$blocked_count" -gt 0 ]; then 1.457 - blocks="("$(eval_ngettext '$blocked_count blocked' \ 1.458 - '$blocked_count blocked' $blocked_count)")" 1.459 + num=$blocked_count 1.460 + blocked=$(eval_ngettext '$num blocked' '$num blocked' $num) 1.461 fi 1.462 + num=$upnb 1.463 boldify "$(eval_ngettext \ 1.464 - 'You have $upnb available upgrade $blocks' \ 1.465 - 'You have $upnb available upgrades $blocks' $upnb)" 1.466 + 'You have $num available upgrade ($blocked)' \ 1.467 + 'You have $num available upgrades ($blocked)' $num)" 1.468 newline 1.469 fi 1.470 # Pkgs to upgrade ? Skip, let install them all or ask user 1.471 @@ -2336,7 +2352,7 @@ 1.472 echo 'y' | tazpkg get-install $pkg --forced 1.473 done 1.474 # List is generated each time and must be cleaned so 1.475 - # tazpkg-notify dont find upgrade anymore. 1.476 + # tazpkg-notify don't find upgrade anymore. 1.477 rm $UP_LIST && touch $UP_LIST ;; 1.478 *) 1.479 gettext "Leaving without any upgrades installed."; echo 1.480 @@ -2439,11 +2455,12 @@ 1.481 do 1.482 pkg=${f%/files.list} 1.483 if [ -f $pkg/modifiers ]; then 1.484 - overriders="$(cat $pkg/modifiers)" 1.485 - eval_gettext ' $pkg (overridden by $overriders)' 1.486 + pkg_list="$(cat $pkg/modifiers)" 1.487 + overriders=$(eval_gettext '(overridden by $pkg_list)') 1.488 else 1.489 - echo -n " $pkg" 1.490 + overriders='' 1.491 fi 1.492 + echo -n " $pkg $overriders" 1.493 newline 1.494 done 1.495 done 1.496 @@ -2607,9 +2624,10 @@ 1.497 action "Cleaning cache directory..." 1.498 rm -rf $CACHE_DIR/* 1.499 status 1.500 + num=$(emsg "<c 32>$new_pkgs</c>") 1.501 footer "$(eval_ngettext \ 1.502 - '$files file removed from cache.' \ 1.503 - '$files files removed from cache.' $files)" 1.504 + '$num file removed from cache.' \ 1.505 + '$num files removed from cache.' $files)" 1.506 ;; 1.507 list-undigest) 1.508 # list undigest URLs. 1.509 @@ -2700,7 +2718,7 @@ 1.510 newline 1.511 fi ;; 1.512 shell) 1.513 - # Tazpkg SHell 1.514 + # TazPkg SHell 1.515 if test $(id -u) = 0 ; then 1.516 PROMPT="\\033[1;33mtazpkg\\033[0;39m# " 1.517 else 1.518 @@ -2708,7 +2726,7 @@ 1.519 fi 1.520 if [ ! "$2" = "--noheader" ]; then 1.521 clear 1.522 - title 'Tazpkg SHell.' 1.523 + title 'TazPkg SHell.' 1.524 gettext "Type 'usage' to list all available commands or 'quit' or 'q' to exit."; echo 1.525 newline 1.526 fi 1.527 @@ -2719,7 +2737,7 @@ 1.528 q|quit) 1.529 break ;; 1.530 shell) 1.531 - gettext "You are already running a Tazpkg SHell."; echo ;; 1.532 + gettext "You are already running a TazPkg SHell."; echo ;; 1.533 su) 1.534 su -c 'exec tazpkg shell --noheader' && break ;; 1.535 "")