# HG changeset patch
# User Christophe Lincoln <pankso@slitaz.org>
# Date 1235250747 -3600
# Node ID 1956016c09980119a79130fd4b08b2a74f87d1a5
# Parent  9f4db6b4a0ef2f00fff76fee338ea654967c5baf
tazpkgbox: update lib for new functions

diff -r 9f4db6b4a0ef -r 1956016c0998 lib/tazpkgbox/list
--- a/lib/tazpkgbox/list	Sat Feb 21 22:06:40 2009 +0100
+++ b/lib/tazpkgbox/list	Sat Feb 21 22:12:27 2009 +0100
@@ -23,8 +23,12 @@
 	cat /var/lib/tazpkg/packages.desc \
 	    /var/lib/tazpkg/undigest/*/packages.desc 2> /dev/null | sort | \
 	while read PACKAGE VERSION SHORT_DESC; do
-		[ -d /var/lib/tazpkg/installed/${PACKAGE%% *} ] && continue
-		echo "$PACKAGE|$VERSION|$SHORT_DESC"
+		# Check first for category for more speed.
+		CATEGORY=${CATEGORY%| *}
+		if [ "$CAT" == "all" ] || [ "$CATEGORY" == " $CAT " ]; then
+			[ -d /var/lib/tazpkg/installed/${PACKAGE%% *} ] && continue
+			echo "tazpkg|$PACKAGE|$VERSION|$SHORT_DESC"
+		fi
 	done
 	unset IFS
 }
@@ -35,11 +39,31 @@
 	do
 		. $pkg/receipt
 		if [ "$CAT" == "all" -o "$CATEGORY" == "$CAT" ]; then
-			echo "$PACKAGE|$VERSION|$SHORT_DESC"
+			echo "go-next|$PACKAGE|$VERSION|$SHORT_DESC"
 		fi
 	done
 }
 
+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
+		if [ -d /var/lib/tazpkg/installed/${PACKAGE%% *} ]; then
+			. /var/lib/tazpkg/installed/${PACKAGE%% *}/receipt
+			echo "go-next|$PACKAGE|$VERSION|$SHORT_DESC"
+		else
+			echo "tazpkg|$PACKAGE|$VERSION|$SHORT_DESC"
+		fi
+	fi
+	done
+	unset IFS
+}
+
 blocked_list()
 {
 	for pkg in /var/lib/tazpkg/installed/*
@@ -47,23 +71,27 @@
 		. $pkg/receipt
 		if grep -qs "^$(basename $pkg)$" /var/lib/tazpkg/blocked-packages.list; then
 			AVAILABLE=$(grep "^$(basename $pkg) " /var/lib/tazpkg/packages.desc | awk '{ print $3 }')
-			
-			echo "$PACKAGE|$VERSION|$AVAILABLE|$SHORT_DESC"
+			echo "stop|$PACKAGE|$VERSION (Available: $AVAILABLE)|$SHORT_DESC"
 		fi
 	done
 }
 
 case $1 in
-	installed)
-		CAT=`cat /tmp/tazpkgbox/installed-category`
-		installed_list $CAT;;
-	installable)
-		CAT=`cat /tmp/tazpkgbox/installable-category`
-		if [ "$CAT" == "all" ]; then
-			installable_list
-		else
-			installable_list | grep "$CAT"
-		fi ;;
+	all)
+		STATUS=`cat /tmp/tazpkgbox/status`
+		case $STATUS in
+			blocked)
+				blocked_list ;;
+			installed)
+				CAT=`cat /tmp/tazpkgbox/category`
+				installed_list ;;
+			installable)
+				CAT=`cat /tmp/tazpkgbox/category`
+				installable_list ;;
+			*)
+				CAT=`cat /tmp/tazpkgbox/category`
+				all_list ;;
+		esac ;;
 	undigest)
 		set -- `cat /tmp/tazpkgbox/undigest-category`
 		if [ "$1" == "all" -o "$1" == "" ]; then
@@ -71,17 +99,10 @@
 		else
 			undigest_list $2 | grep "$1"
 		fi ;;
-	mirrored)
-		CAT=`cat /tmp/tazpkgbox/mirrored-category`
-		if [ "$CAT" == "all" ]; then
-			cat /var/lib/tazpkg/packages.desc
-		else
-			grep "$CAT" /var/lib/tazpkg/packages.desc
-		fi ;;
 	blocked)
-		blocked_list;;
+		blocked_list ;;
 	*)
-		echo "Usage: /usr/lib/slitaz/tazpkgbox/list [installed|installable|mirrored|undigest|blocked]" ;;
+		echo "Usage: $0 [all|undigest|blocked]" ;;
 esac
 
 exit 0
diff -r 9f4db6b4a0ef -r 1956016c0998 tazpkgbox
--- a/tazpkgbox	Sat Feb 21 22:06:40 2009 +0100
+++ b/tazpkgbox	Sat Feb 21 22:12:27 2009 +0100
@@ -1,21 +1,22 @@
 #!/bin/sh
 #
-# GTKdialog interface to SliTaz Packages Manager aka Tazpkg. Functions
-# path: /usr/lib/slitaz/tazpkgbox. Notes: Notebook tab are vbox, tab are
-# used to indent.
+# GTKdialog interface to SliTaz Packages Manager aka Tazpkg. Notes: 
+# Notebook tab are vbox, tab are used to indent and functions are 
+# splited ang found in $LIB.
 #
 # (C) GNU gpl v3 - SliTaz GNU/Linux 2009.
 #
 VERSION=2.6
 
+# Functions path.
+export LIB=/usr/lib/lib/tazpkgbox
+
 # Tazpkgbox is only for root.
 if test $(id -u) != 0 ; then
 	exec subox tazpkgbox
 	exit 0
 fi
 
-export LIB=$PWD/lib/tazpkgbox
-
 # We need at least a mirror URL.
 if [ ! -f /var/lib/tazpkg/mirror ]; then
 	tazpkg >/dev/null