tazpkg rev 475
Use spearator when needed.
| author | Christopher Rogers <slaxemulator@gmail.com> |
|---|---|
| date | Fri Apr 08 14:29:46 2011 +0000 (2011-04-08) |
| parents | d0691ae20fa2 |
| children | 10bc53124903 |
| files | tazpkg |
line diff
1.1 --- a/tazpkg Fri Apr 08 18:39:40 2011 +0200 1.2 +++ b/tazpkg Fri Apr 08 14:29:46 2011 +0000 1.3 @@ -494,7 +494,7 @@ 1.4 [ -n "$INSTALL_LIST" ] && echo "$PACKAGE_FILE" >> $INSTALL_LIST-processed 1.5 echo "" 1.6 echo -e "\033[1m`gettext \"Installation of :\"`\033[0m $PACKAGE" 1.7 - echo "================================================================================" 1.8 + separator 1.9 eval_gettext "Copying \$PACKAGE... " 1.10 cp $PACKAGE_FILE $TMP_DIR 1.11 status 1.12 @@ -626,7 +626,7 @@ 1.13 updatemimedb=yes 1.14 fi 1.15 cd $TOP_DIR 1.16 - echo "================================================================================" 1.17 + separator 1.18 eval_gettext "\$PACKAGE (\$VERSION\$EXTRAVERSION) is installed."; echo 1.19 echo "" 1.20 # Log this activity 1.21 @@ -683,7 +683,7 @@ 1.22 done 1.23 if [ ! "$MISSING_PACKAGE" = "" ]; then 1.24 echo -e "\033[1m`gettext \"Tracking dependencies for :\"`\033[0m $PACKAGE" 1.25 - echo "================================================================================" 1.26 + separator 1.27 for pkgorg in $DEPENDS 1.28 do 1.29 i=$(equivalent_pkg $pkgorg $1) 1.30 @@ -692,7 +692,7 @@ 1.31 eval_gettext "Missing: \$MISSING_PACKAGE"; echo 1.32 fi 1.33 done 1.34 - echo "================================================================================" 1.35 + separator 1.36 eval_gettext "\$deps missing package(s) to install."; echo 1.37 fi 1.38 } 1.39 @@ -830,7 +830,7 @@ 1.40 search_in_installed_packages() 1.41 { 1.42 gettext "Installed packages"; echo 1.43 - echo "================================================================================" 1.44 + separator 1.45 list=`ls -1 $INSTALLED | grep -i "$PATTERN"` 1.46 for pkg in $list 1.47 do 1.48 @@ -847,7 +847,7 @@ 1.49 eval_gettext "0 installed packages found for : \$PATTERN"; echo 1.50 echo "" 1.51 else 1.52 - echo "================================================================================" 1.53 + separator 1.54 eval_gettext "\$packages installed package(s) found for : \$PATTERN"; echo 1.55 echo "" 1.56 fi 1.57 @@ -857,7 +857,7 @@ 1.58 search_in_packages_list() 1.59 { 1.60 gettext "Available packages name-version"; echo 1.61 - echo "================================================================================" 1.62 + separator 1.63 packages=0 1.64 for i in $LOCALSTATE/packages.list $LOCALSTATE/undigest/*/packages.list; do 1.65 grep -is "$PATTERN" $i 1.66 @@ -874,7 +874,7 @@ 1.67 eval_gettext "0 available packages found for : \$PATTERN"; echo 1.68 echo "" 1.69 else 1.70 - echo "================================================================================" 1.71 + separator 1.72 eval_gettext "\$packages available package(s) found for : \$PATTERN"; echo 1.73 echo "" 1.74 fi 1.75 @@ -885,7 +885,7 @@ 1.76 search_in_packages_txt() 1.77 { 1.78 gettext "Matching packages name with version and desc"; echo 1.79 - echo "================================================================================" 1.80 + separator 1.81 packages=0 1.82 for i in $LOCALSTATE/packages.txt $LOCALSTATE/undigest/*/packages.txt; do 1.83 grep -is -A 2 "^$PATTERN" $i 1.84 @@ -902,7 +902,7 @@ 1.85 eval_gettext "0 available packages found for : \$PATTERN"; echo 1.86 echo "" 1.87 else 1.88 - echo "================================================================================" 1.89 + separator 1.90 eval_gettext "\$packages available package(s) found for : \$PATTERN"; echo 1.91 echo "" 1.92 fi 1.93 @@ -965,7 +965,7 @@ 1.94 fi 1.95 echo "" 1.96 echo -e "\033[1m`gettext \"Current mirror(s)\"`\033[0m" 1.97 - echo "================================================================================" 1.98 + separator 1.99 echo " `cat $1/mirror 2> /dev/null`" 1.100 gettext \ 1.101 "Please enter URL of the new mirror (http, ftp or local path). You must specify 1.102 @@ -1455,7 +1455,7 @@ 1.103 if [ "$2" = "blocked" ]; then 1.104 echo "" 1.105 echo -e "\033[1m`gettext \"Blocked packages\"`\033[0m" 1.106 - echo "================================================================================" 1.107 + separator 1.108 if [ -s "$BLOCKED" ];then 1.109 cat $BLOCKED 1.110 else 1.111 @@ -1467,13 +1467,13 @@ 1.112 if [ "$2" = "cat" -o "$2" = "categories" ]; then 1.113 echo "" 1.114 echo -e "\033[1m`gettext \"Packages categories\"`\033[0m" 1.115 - echo "================================================================================" 1.116 + separator 1.117 for i in $CATEGORIES 1.118 do 1.119 translate_category $i; echo 1.120 categories=$(($categories+1)) 1.121 done 1.122 - echo "================================================================================" 1.123 + separator 1.124 eval_gettext "\$categories categories"; echo 1.125 echo "" 1.126 exit 0 1.127 @@ -1484,7 +1484,7 @@ 1.128 ASKED_CATEGORY=$(reverse_translate_category $2) 1.129 echo "" 1.130 echo -e "\033[1m`gettext \"Installed packages of category:\"`\033[0m $ASKED_CATEGORY_I18N" 1.131 - echo "================================================================================" 1.132 + separator 1.133 for pkg in $INSTALLED/* 1.134 do 1.135 [ -f $pkg/receipt ] || continue 1.136 @@ -1496,14 +1496,14 @@ 1.137 packages=$(($packages+1)) 1.138 fi 1.139 done 1.140 - echo "================================================================================" 1.141 + separator 1.142 eval_gettext "\$packages packages installed of category \$ASKED_CATEGORY_I18N."; echo 1.143 echo "" 1.144 else 1.145 # By default list all packages and versions. 1.146 echo "" 1.147 echo -e "\033[1m`gettext \"List of all installed packages\"`\033[0m" 1.148 - echo "================================================================================" 1.149 + separator 1.150 for pkg in $INSTALLED/* 1.151 do 1.152 [ -f $pkg/receipt ] || continue 1.153 @@ -1514,7 +1514,7 @@ 1.154 echo -e "\033[42G `translate_category $CATEGORY`" 1.155 packages=$(($packages+1)) 1.156 done 1.157 - echo "================================================================================" 1.158 + separator 1.159 eval_gettext "\$packages packages installed."; echo 1.160 echo "" 1.161 fi ;; 1.162 @@ -1528,7 +1528,7 @@ 1.163 fi 1.164 echo "" 1.165 echo -e "\033[1m`gettext \"Creating xHTML list of installed packages\"`\033[0m" 1.166 - echo "================================================================================" 1.167 + separator 1.168 gettext "Generating xHTML header..." 1.169 xhtml_header 1.170 status 1.171 @@ -1548,7 +1548,7 @@ 1.172 status 1.173 # sed pkgs nb in header. 1.174 sed -i s/'_packages_'/"$packages"/ $XHTML_LIST 1.175 - echo "================================================================================" 1.176 + separator 1.177 eval_gettext "\$XHTML_LIST created - $packages packages."; echo 1.178 echo "" ;; 1.179 list-mirror) 1.180 @@ -1560,9 +1560,9 @@ 1.181 if [ -f "$LOCALSTATE/packages.diff" ]; then 1.182 echo "" 1.183 echo -e "\033[1m`gettext \"Mirrored packages diff\"`\033[0m" 1.184 - echo "================================================================================" 1.185 + separator 1.186 cat $LOCALSTATE/packages.diff 1.187 - echo "================================================================================" 1.188 + separator 1.189 pkgs=`cat $LOCALSTATE/packages.diff | wc -l` 1.190 eval_gettext "\$pkgs new packages listed on the mirror."; echo 1.191 echo "" 1.192 @@ -1575,15 +1575,15 @@ 1.193 --text|--txt) 1.194 echo "" 1.195 echo -e "\033[1m`gettext \"List of available packages on the mirror\"`\033[0m" 1.196 - echo "================================================================================" 1.197 + separator 1.198 cat $LOCALSTATE/packages.txt ;; 1.199 --raw|*) 1.200 echo "" 1.201 echo -e "\033[1m`gettext \"List of available packages on the mirror\"`\033[0m" 1.202 - echo "================================================================================" 1.203 + separator 1.204 cat $LOCALSTATE/packages.list ;; 1.205 esac 1.206 - echo "================================================================================" 1.207 + separator 1.208 pkgs=`cat $LOCALSTATE/packages.list | wc -l` 1.209 eval_gettext "\$pkgs packages in the last recharged list."; echo 1.210 echo "" ;; 1.211 @@ -1594,9 +1594,9 @@ 1.212 check_for_receipt 1.213 echo "" 1.214 echo -e "\033[1m`gettext \"Installed files with:\"`\033[0m $PACKAGE" 1.215 - echo "================================================================================" 1.216 + separator 1.217 cat $INSTALLED/$PACKAGE/files.list | sort 1.218 - echo "================================================================================" 1.219 + separator 1.220 files=`cat $INSTALLED/$PACKAGE/files.list | wc -l` 1.221 eval_gettext "\$files files installed with \$PACKAGE."; echo 1.222 echo "" ;; 1.223 @@ -1630,16 +1630,16 @@ 1.224 if [ "$WEB_SITE" ]; then 1.225 echo -e "`gettext \"Web site :\"` $WEB_SITE" 1.226 fi 1.227 - echo "================================================================================" 1.228 + separator 1.229 echo "" ;; 1.230 desc) 1.231 # Display package description.txt if available. 1.232 if [ -f "$INSTALLED/$PACKAGE/description.txt" ]; then 1.233 echo "" 1.234 echo -e "\033[1m`gettext \"Description of:\"`\033[0m $PACKAGE" 1.235 - echo "================================================================================" 1.236 + separator 1.237 cat $INSTALLED/$PACKAGE/description.txt 1.238 - echo "================================================================================" 1.239 + separator 1.240 echo "" 1.241 else 1.242 echo "" 1.243 @@ -1684,8 +1684,8 @@ 1.244 fi 1.245 echo "" 1.246 echo -e "\033[1m`gettext \"Search result for file\"`\033[0m $2" 1.247 - echo "================================================================================" 1.248 - 1.249 + separator 1.250 + 1.251 if [ "$3" == "--mirror" ]; then 1.252 1.253 match=0 1.254 @@ -1729,7 +1729,7 @@ 1.255 echo "" 1.256 else 1.257 echo "" 1.258 - echo "================================================================================" 1.259 + separator 1.260 eval_gettext "\$match file(s) found for: \$pkg"; echo 1.261 echo "" 1.262 fi ;; 1.263 @@ -1744,8 +1744,8 @@ 1.264 fi 1.265 echo "" 1.266 echo -e "\033[1m`gettext \"Search result for file\"`\033[0m $2" 1.267 - echo "================================================================================" 1.268 - 1.269 + separator 1.270 + 1.271 # Search for a file on mirror and output only the package name 1.272 match=0 1.273 for i in $LOCALSTATE/files.list.lzma \ 1.274 @@ -1760,7 +1760,7 @@ 1.275 echo "" 1.276 else 1.277 echo "" 1.278 - echo "================================================================================" 1.279 + separator 1.280 eval_gettext "$match pkg(s) found with file: \$file"; echo 1.281 echo "" 1.282 fi 1.283 @@ -1918,7 +1918,7 @@ 1.284 if [ "$answer" = "$(translate_querry y)" ]; then 1.285 echo "" 1.286 echo -e "\033[1m`gettext \"Removing:\"`\033[0m $PACKAGE" 1.287 - echo "================================================================================" 1.288 + separator 1.289 # Pre remove commands. 1.290 if grep -q ^pre_remove $ROOT$INSTALLED/$PACKAGE/receipt; then 1.291 pre_remove 1.292 @@ -1998,7 +1998,7 @@ 1.293 check_for_package_file 1.294 echo "" 1.295 echo -e "\033[1m`gettext \"Extracting:\"`\033[0m $PACKAGE" 1.296 - echo "================================================================================" 1.297 + separator 1.298 # If no directory destination is found on the cmdline 1.299 # we create one in the current dir using the package name. 1.300 if [ -n "$TARGET_DIR" ]; then 1.301 @@ -2012,7 +2012,7 @@ 1.302 status 1.303 cd $DESTDIR 1.304 extract_package 1.305 - echo "================================================================================" 1.306 + separator 1.307 eval_gettext "\$PACKAGE is extracted to: \$DESTDIR"; echo 1.308 echo "" ;; 1.309 recompress) 1.310 @@ -2022,7 +2022,7 @@ 1.311 check_for_package_file 1.312 echo "" 1.313 echo -e "\033[1m`gettext \"Recompressing:\"`\033[0m $PACKAGE" 1.314 - echo "================================================================================" 1.315 + separator 1.316 mkdir -p $TMP_DIR 1.317 gettext "Copying original package..." 1.318 cp $PACKAGE_FILE $TMP_DIR 1.319 @@ -2067,13 +2067,13 @@ 1.320 else 1.321 echo "" 1.322 echo -e "\033[1m`gettext \"Configuration files\"`\033[0m" 1.323 - echo "================================================================================" 1.324 + separator 1.325 for i in $INSTALLED/*/volatile.cpio.gz; do 1.326 [ -n "$2" -a "$i" != "$INSTALLED/$2/volatile.cpio.gz" ] && continue 1.327 [ -f "$i" ] || continue 1.328 zcat $i | cpio -t --quiet 1.329 done | sed 's|^|/|' | sort 1.330 - echo "================================================================================" 1.331 + separator 1.332 echo "" 1.333 fi ;; 1.334 repack-config) 1.335 @@ -2121,7 +2121,7 @@ 1.336 . $INSTALLED/$PACKAGE/receipt 1.337 echo "" 1.338 echo -e "\033[1mRepacking :\033[0m $PACKAGE-$VERSION$EXTRAVERSION.tazpkg" 1.339 - echo "================================================================================" 1.340 + separator 1.341 if grep -qs ^NO_REPACK= $INSTALLED/$PACKAGE/receipt; then 1.342 eval_gettext "Can't repack \$PACKAGE"; echo 1.343 exit 1 1.344 @@ -2191,7 +2191,7 @@ 1.345 else 1.346 echo "" 1.347 echo -e "\033[1mPacking :\033[0m $PACKAGE" 1.348 - echo "================================================================================" 1.349 + separator 1.350 # Create files.list with redirecting find outpout. 1.351 gettext "Creating the list of files..." && cd fs 1.352 find . -type f -print > ../files.list 1.353 @@ -2231,7 +2231,7 @@ 1.354 unlzma -c fs.cpio.lzma | cpio -idm --quiet 1.355 status 1.356 rm fs.cpio.lzma && cd .. 1.357 - echo "================================================================================" 1.358 + separator 1.359 eval_gettext "Package \$PACKAGE compressed successfully."; echo 1.360 echo "`gettext \"Size\"` : `du -sh $PACKAGE.tazpkg`" 1.361 echo "" 1.362 @@ -2325,11 +2325,11 @@ 1.363 sed -i s/+// packages.diff 1.364 echo "" 1.365 echo -e "\033[1m`gettext \"Mirrored packages diff\"`\033[0m" 1.366 - echo "================================================================================" 1.367 + separator 1.368 cat packages.diff 1.369 new_pkgs=`cat packages.diff | wc -l` 1.370 if [ "$new_pkgs" != 0 ]; then 1.371 - echo "================================================================================" 1.372 + separator 1.373 eval_gettext "\$new_pkgs new packages on the mirror."; echo 1.374 echo "" 1.375 else 1.376 @@ -2458,7 +2458,7 @@ 1.377 rm -f upgradeable-packages.list 1.378 echo "" 1.379 echo -e "\033[1m`gettext \"Available upgrades\"`\033[0m" 1.380 - echo "================================================================================" 1.381 + separator 1.382 echo "" 1.383 # Some packages must be installed first 1.384 FIRST_CLASS_PACKAGE=" glibc-base slitaz-base-files slitaz-boot-scripts " 1.385 @@ -2554,13 +2554,13 @@ 1.386 # Clean last checked package and display summary. 1.387 if [ ! "$up" = "" ]; then 1.388 echo -e "\\033[0G " 1.389 - echo "================================================================================" 1.390 + separator 1.391 eval_gettext "\$packages installed and listed packages to consider, \$up to upgrade, \$blocked blocked."; echo 1.392 echo "" 1.393 else 1.394 echo -e "\\033[0G`gettext \"System is up-to-date.\"` " 1.395 echo "" 1.396 - echo "================================================================================" 1.397 + separator 1.398 eval_gettext "\$packages installed and listed packages to consider, 0 to upgrade, \$blocked blocked."; echo 1.399 echo "" 1.400 exit 0 1.401 @@ -2833,11 +2833,11 @@ 1.402 files=`ls -1 $CACHE_DIR | wc -l` 1.403 echo "" 1.404 echo -e "\033[1m`gettext \"Clean cache:\"`\033[0m $CACHE_DIR" 1.405 - echo "================================================================================" 1.406 + separator 1.407 gettext "Cleaning cache directory..."; echo 1.408 rm -rf $CACHE_DIR/* 1.409 status 1.410 - echo "================================================================================" 1.411 + separator 1.412 eval_gettext "\$files file(s) removed from cache."; echo 1.413 echo "" ;; 1.414 list-undigest) 1.415 @@ -2851,7 +2851,7 @@ 1.416 else 1.417 echo "" 1.418 echo -e "\033[1m`gettext \"Current undigest(s)\"`\033[0m" 1.419 - echo "================================================================================" 1.420 + separator 1.421 for i in $LOCALSTATE/undigest/*/mirror; do 1.422 if [ ! -f $i ]; then 1.423 gettext "No undigest mirror found."; echo 1.424 @@ -2948,7 +2948,7 @@ 1.425 clear 1.426 echo "" 1.427 echo -e "\033[1m`gettext \"Tazpkg SHell\"`.\033[0m" 1.428 - echo "================================================================================" 1.429 + separator 1.430 gettext "Type 'usage' to list all available commands or 'quit' or 'q' to exit."; echo 1.431 echo "" 1.432 fi