# HG changeset patch
# User Christophe Lincoln <pankso@slitaz.org>
# Date 1337859395 -7200
# Node ID 773b38c19f4ea9748c68ce141d0013e2349bf88b
# Parent  2697357588157fa69d9ec6af050c54667d2a2256
tazpkg: improve up output and small clean

diff -r 269735758815 -r 773b38c19f4e doc/tazpkg.en.html
--- a/doc/tazpkg.en.html	Wed May 23 12:54:35 2012 +0000
+++ b/doc/tazpkg.en.html	Thu May 24 13:36:35 2012 +0200
@@ -43,14 +43,14 @@
 a receipt and an optional description. Tazpkg also manages
 dependencies based on package receipts. Each receipt contains
 all the information about a package and can also include
-pre and post installation functions. The same receipt is 
-used by Cookutils to compile sources and generate a .tazpkg 
+pre and post installation functions. The same receipt is
+used by Cookutils to compile sources and generate a .tazpkg
 package.
 </p>
 <p>
-Tazpkg is entirely built from scratch using SHell script, 
-compatible with Bash; it runs under Ash—part of the Busybox 
-project. Tazpkg is distributed under the free GNU license GPL V3. 
+Tazpkg is entirely built from scratch using SHell script,
+compatible with Bash; it runs under Ash—part of the Busybox
+project. Tazpkg is distributed under the free GNU license GPL V3.
 </p>
 
 
@@ -60,8 +60,8 @@
 <h3 id="list">list</h3>
 
 <p>
-List packages installed on the system. This command displays 
-a column list of all installed packages, It also allows you to list the 
+List packages installed on the system. This command displays
+a column list of all installed packages, It also allows you to list the
 categories, packages based on category and packages placed on hold.
 You can also use the <tt><a href="#search">search</a></tt> command
 for a list based on a term or package name:
@@ -108,7 +108,7 @@
 <h3 id="info">info</h3>
 
 <p>
-Display any information available in the receipt for the 
+Display any information available in the receipt for the
 package in question—its version, category, maintainer,
 Web site and any dependencies (see also Cookutils for more
 information on receipts):
@@ -160,7 +160,7 @@
 <p>
 Search for packages by owner or package name. This command
 will search for the term wanted in the installed packages and the
-list of available packages on the mirror. To obtain the 
+list of available packages on the mirror. To obtain the
 latest list of installable packages on the mirror, just
 run <code>tazpkg recharge</code> before conducting a search:
 </p>
@@ -174,7 +174,7 @@
 <p>
 The <tt>search-file</tt> command allows you to search for a file
 among the files installed by the packages. This command is very
-useful to find the full path to a file and determine if 
+useful to find the full path to a file and determine if
 a file is present on the system. Example:
 </p>
 <pre>
@@ -187,10 +187,10 @@
 <p>
 This command allows the installation of a local package with
 the <tt>.tazpkg</tt> extension. See
-<tt><a href="#get-install">get-install</a></tt> to install a 
+<tt><a href="#get-install">get-install</a></tt> to install a
 package from the internet. Note that you can force the
 installation via the <tt>--forced</tt>, <tt>uninstall</tt> and
-<tt>reinstall</tt> options 
+<tt>reinstall</tt> options
 or specify the root system where you want to install the
 packages via the <tt>--root=</tt> option:
 </p>
@@ -215,9 +215,9 @@
 <h3 id="link">link</h3>
 
 <p>
-This command allows the installation of a package from another media 
-device. The set up is done through symbolic links and consumes very little 
-memory. It is generally used within the system RAM to install add-ons 
+This command allows the installation of a package from another media
+device. The set up is done through symbolic links and consumes very little
+memory. It is generally used within the system RAM to install add-ons
 from an USB key:
 </p>
 <pre>
@@ -256,7 +256,7 @@
 
 <p>
 The <tt>pack</tt> command will create a package from a directory
-prepared in advance or from an unpacked package. It can 
+prepared in advance or from an unpacked package. It can
 also manually create a .tazpkg package (see the Cookutils documentation
 for the automatic creation of packages). To pack a package:
 </p>
@@ -282,8 +282,8 @@
 <p>
 The <tt>repack-config</tt> command recreates a package
 of the system configuration files (see
-<tt><a href="#list-config">list-config</a></tt>). It is enough 
-to install the package to find the current configuration. To repack 
+<tt><a href="#list-config">list-config</a></tt>). It is enough
+to install the package to find the current configuration. To repack
 the configuration files:
 </p>
 <pre>
@@ -294,9 +294,9 @@
 <h3 id="recharge">recharge</h3>
 
 <p>
-Recharge the list of available packages on the mirror. 
+Recharge the list of available packages on the mirror.
 This command will download the most recent <tt>packages.list</tt>
-of installable packages on the mirror and before starting 
+of installable packages on the mirror and before starting
 will save the old list. Once the list is updated,
 you can then use the <tt><a href="#list">list</a></tt> and
 <tt><a href="#search">search</a></tt> commands. To view
@@ -318,8 +318,8 @@
 part of system security, it helps to keep you secure with
 the latest updates and fixes. The SliTaz project,
 although tiny, provides regular updates on security and generally
-offers the latest versions of software. Note that this 
-function is aimed at people with SliTaz installed on a 
+offers the latest versions of software. Note that this
+function is aimed at people with SliTaz installed on a
 hard drive. Updated packages in LiveCD mode will be lost on
 system shutdown. To upgrade or display the full <tt>up</tt> options:
 </p>
@@ -335,7 +335,7 @@
 
 <p>
 The <tt>check</tt> command can check dependencies on installed
-packages and determine whether all the files needed for the 
+packages and determine whether all the files needed for the
 repacking of packages are present:
 </p>
 <pre>
@@ -377,7 +377,7 @@
 <p>
 Get and install a package from a mirror on the internet.
 The <tt>get-install</tt> command begins by checking whether the
-package exists on the mirror and if it has been already downloaded. 
+package exists on the mirror and if it has been already downloaded.
 For a list of packages on the mirror, we must
 use the <tt><a href="#list-mirror">list-mirror</a></tt> command.
 To install the package Grub:
@@ -390,9 +390,9 @@
 <h3 id="clean-cache">clean-cache</h3>
 
 <p>
-Remove *.tazpkg packages downloaded to the cache. During 
+Remove *.tazpkg packages downloaded to the cache. During
 installation, Tazpkg keeps a copy of packages downloaded
-from the web. This is done to save bandwidth in case of 
+from the web. This is done to save bandwidth in case of
 reinstallation, but you may want to free up space on the hard
 drive or re-download the packages:
 </p>
@@ -477,7 +477,7 @@
 <h3 id="convert">convert</h3>
 
 <p>
-Converts a Debian package (.deb), Redhat (.rpm), Slackware (.tgz) or 
+Converts a Debian package (.deb), Redhat (.rpm), Slackware (.tgz) or
 Archlinux (.pkg.tar.gz) package into a SliTaz package (.tazpkg):
 </p>
 <pre>
@@ -487,7 +487,7 @@
 
 <h3 id="set-release">set-release</h3>
 <p>
-The <tt>set-release</tt> command changes the current version and 
+The <tt>set-release</tt> command changes the current version and
 upgrades all of the packages to the latest release:
 </p>
 <pre>
diff -r 269735758815 -r 773b38c19f4e tazpkg
--- a/tazpkg	Wed May 23 12:54:35 2012 +0000
+++ b/tazpkg	Thu May 24 13:36:35 2012 +0200
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Tazpkg - Tiny autonomous zone packages manager.
 #
-# This is a lightwight packages manager for *.tazpkg files written in SHell 
+# 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
@@ -34,7 +34,7 @@
 COMMAND=$1
 PACKAGE=${2%/}
 PACKAGE_DIR="$(cd $(dirname $PACKAGE 2>/dev/null) 2>/dev/null; pwd)"
-[ -n "$PACKAGE" ] && 
+[ -n "$PACKAGE" ] &&
 PACKAGE_FILE="$PACKAGE_DIR/${PACKAGE##*/}"
 if [ -f "$PACKAGE" ]; then
 	# Set pkg basename for install, extract
@@ -159,7 +159,7 @@
 check_for_package_on_cmdline()
 {
 	if [ -z "$PACKAGE" ]; then
-		echo "" 
+		echo ""
 		gettext "Please specify a package name on the command line."; echo
 		echo ""
 		exit 0
@@ -302,7 +302,7 @@
 # get a virtual package from packages.equiv
 virtual_pkg()
 {
-	for i in $(for rep in $priority; do 
+	for i in $(for rep in $priority; do
 		grep -hs "^$1=" $rep/packages.equiv
 		done | sed "s/^$1=//"); do
 		if echo $i | fgrep -q : ; then
@@ -330,10 +330,10 @@
 			sed 's/^ *//')
 		[ "$pkg" ] && pkg=$(grep -sh "^$1-$pkg" \
 			$rep/packages.list | head -1)
-		
+
 		# Allow user to call a package with his version number.
 		[ "$pkg" ] || pkg=$(grep -sh "^$1$" $rep/packages.list | head -1)
-		
+
 		[ "$pkg" ] || pkg=$(grep -sh "^$1-[0-9]" \
 			$rep/packages.list | head -1)
 		[ "$pkg" ] || pkg=$(grep -sh "^$1-.[\.0-9]" \
@@ -442,7 +442,7 @@
 {
 	# Avoid dirname errors by checking for argument.
 	[ "$1" ] || return
-	
+
 	local dir
 	rm -f $1 2>/dev/null
 	dir="$1"
@@ -536,8 +536,8 @@
 		[ -d "$ROOT$i" ] && continue
 		echo "- $i"
 		check=true
-	  done ; 
-	  $check && for i in *; do 
+	  done ;
+	  $check && for i in *; do
 	  	[ "$i" == "$PACKAGE" ] && continue
 	  	[ -s $i/files.list ] || continue
 	  	awk "{ printf \"$i %s\\n\",\$1 }" < $i/files.list
@@ -712,7 +712,7 @@
 	fi
 }
 
-# Install all missing deps. Auto install or ask user then install all missing 
+# Install all missing deps. Auto install or ask user then install all missing
 # deps from local dir, cdrom, media or from the mirror. In case we want to
 # install packages from local, we need a packages.list to find the version.
 install_deps()
@@ -927,10 +927,10 @@
 install_flavor()
 {
 	check_root
-	
+
 	# Get repositories priority list.
 	look_for_priority
-	
+
 	FLAVOR=$1
 	ARG=$2
 	mkdir -p $TMP_DIR
@@ -1433,10 +1433,10 @@
 		misc) gettext "misc" ;;
 		meta) gettext "meta" ;;
 		non-free) gettext "non-free" ;;
-		
+
 		# Support custom categories by keeping them untranslated.
 		*) echo "$1" ;;
-		
+
 	esac
 }
 
@@ -1457,12 +1457,12 @@
 		`gettext "misc"`) echo "misc" ;;
 		`gettext "meta"`) echo "meta" ;;
 		`gettext "non-free"`) echo "non-free" ;;
-		
+
 		# 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
 }
 
@@ -1714,7 +1714,7 @@
 		echo ""
 		echo -e "\033[1m`gettext \"Search result for file\"`\033[0m $2"
 		separator
-		
+
 		if [ "$3" == "--mirror" ]; then
 
 			match=0
@@ -1762,7 +1762,7 @@
 			eval_gettext "\$match file(s) found for: \$pkg"; echo
 			echo ""
 		fi ;;
-	search-pkgname) 
+	search-pkgname)
 		# Search for a package name
 		if [ -z "$2" ]; then
 			echo ""
@@ -1774,7 +1774,7 @@
 		echo ""
 		echo -e "\033[1m`gettext \"Search result for file\"`\033[0m $2"
 		separator
-		
+
 		# Search for a file on mirror and output only the package name
 		match=0
 		for i in $LOCALSTATE/files.list.lzma \
@@ -1799,7 +1799,7 @@
 		check_root
 		check_for_package_on_cmdline
 		check_for_package_file
-		
+
 		[ "$root" ] && ROOT="$root" && check_base_dir "$root"
 		[ "$list" ] && INSTALL_LIST="$list"
 		if [ "$rootconfig" ]; then
@@ -1822,8 +1822,8 @@
 		fi
 		install_package $ROOT
 		update_desktop_database $ROOT
-		update_mime_database $ROOT 
-		update_icon_database $ROOT 
+		update_mime_database $ROOT
+		update_icon_database $ROOT
 		compile_glib_schemas $ROOT ;;
 	install-list|get-install-list)
 		# Install a set of packages from a list.
@@ -1905,8 +1905,8 @@
 		# Remove packages.
 		check_root
 		check_for_package_on_cmdline
-		
-		[ "$root" ] && ROOT="$root" 
+
+		[ "$root" ] && ROOT="$root"
 		if [ ! -f "$ROOT$INSTALLED/$PACKAGE/receipt" ]; then
 			echo ""
 			eval_gettext "\$PACKAGE is not installed."; echo
@@ -2268,7 +2268,7 @@
 		# must have only the choosen main mirror.
 		#
 		check_root
-		
+
 		ARG=$2
 		if [ "$root" ]; then
 			LOCALSTATE=$root$LOCALSTATE
@@ -2285,11 +2285,11 @@
 			fi
 		else
 			repository_to_recharge="$LOCALSTATE $LOCALSTATE/undigest/*"
-		fi	
+		fi
 		for path in $repository_to_recharge; do
 			[ -f $path/mirror ] || continue
 			cd $path
-			
+
 			# Quietly check if recharging is needed.
 			[ -f ID ] && mv ID ID.bak
 			download_from "$(cat mirror)" ID >/dev/null 2>/dev/null
@@ -2310,7 +2310,7 @@
 				cat ID.bak > ID
 				rm ID.bak
 			fi
-			
+
 			echo ""
 			if [ "$path" != "$LOCALSTATE" ]; then
 				echo -e "`gettext \"Recharging undigest\"` $(basename $path):"
@@ -2330,9 +2330,9 @@
 			for i in desc md5 txt list equiv; do
 				download_from "$(cat mirror)" packages.$i
 			done
-			download_from "$(cat mirror)" files.list.lzma             
+			download_from "$(cat mirror)" files.list.lzma
 			download_from "$(sed 's|packages/.*||' < mirror)" mirrors
-			
+
 			if [ -f "packages.list.bak" ]; then
 				diff -u packages.list.bak packages.list | grep ^+[a-z] > packages.diff
 				sed -i s/+// packages.diff
@@ -2365,7 +2365,7 @@
 		# upgradeable out-of-date. This new way is much, much more faster!
 		# Look into installed packages and get data from receipt, it is fast
 		# and easy to handle vars after using only md5sum to compare packages
-		# 
+		#
 		# Options available for the command: up
 		if [ "$COMMAND" == "--help-up" ]; then
 			usage_up
@@ -2382,6 +2382,7 @@
 					install="n" ;;
 			esac
 		done
+		time=$(date +%s)
 		installed_sum=$LOCALSTATE/installed.$SUM
 		look_for_priority
 		for repo in $priority; do
@@ -2397,10 +2398,10 @@
 				tazpkg recharge $repo_name
 			fi
 		done
-		echo -en "\n\033[1m"
-		gettext "Package"
-		echo -en "\033[26G " && gettext "Update type"
-		echo -e "\033[0m"
+		newline
+		boldify $(gettext "Package") \
+		$(echo -n $(indent 28 $(gettext "Version"))) \
+		$(echo -n $(indent 48 $(gettext "Status")))
 		separator
 		cd $INSTALLED
 		echo "" > $UP_LIST
@@ -2421,19 +2422,22 @@
 					# in this one.
 					grep -q ^$PACKAGE- $pkg_list || continue
 
+					echo -n "$PACKAGE"
+					echo -n $(indent 28 "$VERSION")
+
 					# Skip pkgs listed in $LOCALSTATE/blocked-packages.list
 					if $(grep -qs "^$PACKAGE" $BLOCKED); then
-						blocked_count=$(($blocked_count+1))
+						blocked_count=$(($blocked_count + 1))
+						colorize 31 $(indent 48 $(gettext "Blocked"))
 						break
 					fi
-					
+
 					new=$(grep "^$PACKAGE |" $pkg_desc | awk '{print $3}')
+
 					if [ "$VERSION" == "$new" ]; then
-						echo -n "$PACKAGE"
-						echo -e "\\033[26G `gettext \"New build   :\"` $md5"
+						colorize 34 $(indent 48 $(gettext "New build"))
 					else
-						echo -n "$PACKAGE"
-						echo -e "\\033[26G `gettext \"New version :\"` $new"
+						colorize 32 $(indent 48 $(gettext "New version") $new)
 					fi
 					echo "$PACKAGE" >> $UP_LIST
 					break
@@ -2443,16 +2447,20 @@
 		sed -i /^$/d $UP_LIST
 		upnb=$(cat $UP_LIST | wc -l)
 		pkgs=$(ls | wc -l)
+		time=$(($(date +%s) - $time))
 		if [ "$upnb" = 0 ]; then
 			install="n"
 			gettext -e "System is up-to-date...\n\n"
-		else
-			separator
+		fi
+		separator
+		echo -n "$pkgs "; gettext "installed packages scanned in"; echo " ${time}s"
+		newline
+		if [ "$upnb" != 0 ]; then
 			echo -en "\033[1m"
 			if [ "$blocked_count" -gt 0 ]; then
 				blocks=`eval_gettext " (\$blocked_count blocked)"`
 			fi
-			eval_gettext "You have \$upnb available upgrades\$blocks on \$pkgs installed packages"
+			eval_gettext "You have \$upnb available upgrades\$blocks"
 			echo -e "\033[0m\n"
 		fi
 		# Pkgs to upgrade ? Skip, let install them all or ask user
@@ -2503,10 +2511,10 @@
 	check)
 		# Check installed packages set.
 		check_root
-		
+
 		# Get repositories priority list.
 		look_for_priority
-		
+
 		cd $INSTALLED
 		for PACKAGE in `ls`; do
 			if [ ! -f $PACKAGE/receipt ]; then
@@ -2631,7 +2639,7 @@
 		check_root
 		check_for_package_on_cmdline
 		check_for_packages_list
-		
+
 		[ "$root" ] && ROOT="$root" && check_base_dir "$root"
 		if [ "$rootconfig" ]; then
 			if [ "$root" ]; then
@@ -2643,10 +2651,10 @@
 				exit 1
 			fi
 		fi
-		
+
 		# Get repositories priority list.
 		look_for_priority
-		
+
 		CURRENT_DIR=$PWD
 		check_for_package_in_list
 		cd $CACHE_DIR
@@ -2672,7 +2680,7 @@
 		check_root
 		check_for_package_on_cmdline
 		check_for_packages_list
-		
+
 		DO_CHECK=""
 		[ "$forced" ] && DO_CHECK=no
 		[ "$root" ] && ROOT="$root" && check_base_dir "$root"
@@ -2726,8 +2734,8 @@
 		PACKAGE_FILE=$CACHE_DIR/$PACKAGE.tazpkg
 		[ "$rootconfig" ] && LOCALSTATE=${LOCALSTATE#$root}
 		install_package $ROOT
-		[ "$AUTOEXEC" != "no" ] && $PACKAGE $ROOT 
-		update_desktop_database $ROOT 
+		[ "$AUTOEXEC" != "no" ] && $PACKAGE $ROOT
+		update_desktop_database $ROOT
 		update_mime_database $ROOT ;;
 	clean-cache|-cc)
 		# Remove all downloaded packages.
@@ -2879,7 +2887,7 @@
 	convert|-c)
 		# convert misc package format to .tazpkg
 		check_for_package_file
-		[ -n "$TARGET_DIR" -a -s "$TARGET_DIR/files.list.lzma" ] && 
+		[ -n "$TARGET_DIR" -a -s "$TARGET_DIR/files.list.lzma" ] &&
 			TMPLOCALSTATE="$TARGET_DIR"
 		if [ "$(dd if=$PACKAGE_FILE bs=8 count=1 skip=1 2> /dev/null)" \
 		      == "debian-b" ]; then