# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1243280188 -7200
# Node ID 178a6ed58f61b524f2cd67f4cf489953f49a5280
# Parent  193102ec5cd64e33fd827279e7bd2fb0c390c18b
tazpkgbox: show installed, non-mirror packages for Status=all

diff -r 193102ec5cd6 -r 178a6ed58f61 lib/tazpkgbox/list
--- a/lib/tazpkgbox/list	Mon May 25 20:07:00 2009 +0200
+++ b/lib/tazpkgbox/list	Mon May 25 21:36:28 2009 +0200
@@ -34,9 +34,8 @@
 		# Check first for category for more speed.
 		CATEGORY=${CATEGORY%| *}
 		ICON=tazpkg
-		if [ "$CAT" == "all" ] || [ "$CATEGORY" == " $CAT " ]; then
-			[ -d /var/lib/tazpkg/installed/${PACKAGE%% *} ] && continue
-		fi
+		[ "$CAT" == "all" -o "$CATEGORY" == "$CAT" ] || continue
+		[ -d /var/lib/tazpkg/installed/${PACKAGE%% *} ] && continue
 		grep -qs "^$PACKAGE" /var/lib/tazpkg/undigest/*/packages.desc &&
 			ICON=add
 		echo "$ICON|$PACKAGE|$VERSION|$SHORT_DESC"
@@ -61,28 +60,7 @@
 
 all_list()
 {
-	IFS="|"
-	cat /var/lib/tazpkg/packages.desc \
-	    /var/lib/tazpkg/undigest/*/packages.desc 2> /dev/null | sort | \
-	while read PACKAGE VERSION SHORT_DESC CATEGORY; do
-	# Check first for category for more speed.
-	CATEGORY=${CATEGORY%| *}
-	if [ "$CAT" == "all" ] || [ "$CATEGORY" == " $CAT " ]; then
-		ICON=tazpkg
-		if grep -qs "^$PACKAGE" /var/lib/tazpkg/undigest/*/packages.desc ; then
-			ICON=add
-		fi
-		if [ -d /var/lib/tazpkg/installed/${PACKAGE%% *} ]; then
-			. /var/lib/tazpkg/installed/${PACKAGE%% *}/receipt
-			ICON=tazpkg-installed
-			if grep -qs "^$PACKAGE$" /var/lib/tazpkg/blocked-packages.list; then
-				ICON=stop
-			fi
-		fi
-		echo "$ICON|$PACKAGE|$VERSION|$SHORT_DESC"
-	fi
-	done
-	unset IFS
+	( installable_list ; installed_list ) | sort -t \| -k 2 -u
 }
 
 blocked_list()