# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1216390453 0
# Node ID 3ad89c4852fb087a0d25882e4e18d36fdf44d6c6
# Parent  91d2fe8269c93677120aa68a803eea650e3217ce
tazpkgbox: add installable tab, auto install depends checkbox and improve non-free support

diff -r 91d2fe8269c9 -r 3ad89c4852fb lib/tazpkgbox/list
--- a/lib/tazpkgbox/list	Thu Jul 17 11:29:23 2008 +0000
+++ b/lib/tazpkgbox/list	Fri Jul 18 14:14:13 2008 +0000
@@ -4,23 +4,37 @@
 # List mirrored packages using the packages.desc file.
 #
 
+installable_list()
+{
+	IFS="|"
+	while read PACKAGE VERSION SHORT_DESC; do
+		[ -d /var/lib/tazpkg/installed/${PACKAGE%% *} ] && continue
+		echo "$PACKAGE|$VERSION|$SHORT_DESC"
+	done < /var/lib/tazpkg/packages.desc 2> /dev/null
+	unset IFS
+}
+
+installed_list()
+{
+	for pkg in /var/lib/tazpkg/installed/*
+	do
+		. $pkg/receipt
+		if [ "$CAT" == "all" -o "$CATEGORY" == "$CAT" ]; then
+			echo "$PACKAGE|$VERSION|$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
-			for pkg in /var/lib/tazpkg/installed/*
-			do
-				. $pkg/receipt
-				echo "$PACKAGE|$VERSION|$SHORT_DESC"
-			done
+			installable_list
 		else
-			for pkg in /var/lib/tazpkg/installed/*
-			do
-				. $pkg/receipt
-				if [ "$CATEGORY" == "$CAT" ]; then
-					echo "$PACKAGE|$VERSION|$SHORT_DESC"
-				fi
-			done	
+			installable_list | grep "$CAT"
 		fi ;;
 	mirrored)
 		CAT=`cat /tmp/tazpkgbox/mirrored-category`
@@ -28,20 +42,9 @@
 			cat /var/lib/tazpkg/packages.desc
 		else
 			grep "$CAT" /var/lib/tazpkg/packages.desc
-			#for pkg in `grep "$CAT" /var/lib/tazpkg/packages.desc | cut -d "|" -f 1`
-			#do
-				#RES=`grep "^$pkg"  /var/lib/tazpkg/packages.desc | head -n 1`
-				#CATEGORY=`echo "$RES" | cut -d "|" -f 4`
-				##echo "$pkg|$CATEGORY"
-				#if [ "$CATEGORY" == "$CAT" ]; then
-					#VERSION=`echo $RES | cut -d "|" -f 2`
-					#SHORT_DESC=`echo $RES | cut -d "|" -f 3`
-					#echo "$pkg | $VERSION | $SHORT_DESC"
-				#fi
-			#done
 		fi ;;
 	*)
-		echo "Usage: /usr/lib/slitaz/tazpkgbox/list [installed|mirrored]" ;;
+		echo "Usage: /usr/lib/slitaz/tazpkgbox/list [installed|installable|mirrored]" ;;
 esac
 
 exit 0
diff -r 91d2fe8269c9 -r 3ad89c4852fb lib/tazpkgbox/package_infos
--- a/lib/tazpkgbox/package_infos	Thu Jul 17 11:29:23 2008 +0000
+++ b/lib/tazpkgbox/package_infos	Fri Jul 18 14:14:13 2008 +0000
@@ -82,6 +82,14 @@
 	</tree>
 
 	<hbox>"
+[ $CATEGORY = non-free -a ! -d /var/lib/tazpkg/installed/${PKG#get-} ] && PACKAGE_INFOS="$PACKAGE_INFOS
+		<button>
+			<label>Install</label>
+			<input file icon=\"go-next\"></input>
+			<action>xterm -T \"Install ${PKG#get-}\" $XTERM_OPTS -e \"\
+			$PKG; sleep 5\"</action>
+			<action type=\"closewindow\">INSTALLED_PACKAGE_ACTIONS</action>
+		</button>"
 grep -q post_install /var/lib/tazpkg/installed/$PKG/receipt && PACKAGE_INFOS="$PACKAGE_INFOS
 		<button>
 			<label>Reconfigure</label>
@@ -163,12 +171,27 @@
 		<item icon=\"applications-internet\">Web site: | $WEB_SITE</item>
 	</tree>
 
-	<hbox>
+	<hbox>"
+	[ $CATEGORY = non-free ] && PACKAGE_INFOS="$PACKAGE_INFOS
+		<checkbox>
+			<label>Auto exec</label>
+			<variable>AUTO_EXEC</variable>
+			<default>true</default>
+		</checkbox>"
+	PACKAGE_INFOS="$PACKAGE_INFOS
+		<checkbox>
+			<label>Auto install depends</label>
+			<variable>AUTO_DEPENDS</variable>
+			<default>true</default>
+		</checkbox>
 		<button>
 			<label>Get-install</label>
 			<input file icon=\"go-next\"></input>
 			<action>xterm -T \"Install $PACKAGE\" $XTERM_OPTS -e \"\
-			tazpkg get-install $PACKAGE; sleep 2\"</action>
+			if [ \$AUTO_DEPENDS != true ]; then tazpkg get-install $PACKAGE;\
+			else yes y | tazpkg get-install $PACKAGE; fi; \
+			[ \${AUTO_EXEC}$CATEGORY = truenon-free ] && $PACKAGE; \
+			sleep 2\"</action>
 			<action type=\"closewindow\">MIRRORED_PACKAGE_ACTIONS</action>
 		</button>
 		<button>
diff -r 91d2fe8269c9 -r 3ad89c4852fb tazpkgbox
--- a/tazpkgbox	Thu Jul 17 11:29:23 2008 +0000
+++ b/tazpkgbox	Fri Jul 18 14:14:13 2008 +0000
@@ -23,6 +23,7 @@
 # list and search files to load less data and have a faster start.
 mkdir -p /tmp/tazpkgbox
 echo "all" > /tmp/tazpkgbox/installed-category
+echo "all" > /tmp/tazpkgbox/installable-category
 echo "all" > /tmp/tazpkgbox/mirrored-category
 echo "" > /tmp/tazpkgbox/search-installed
 echo "" > /tmp/tazpkgbox/search-mirrored
@@ -85,7 +86,7 @@
 		</pixmap>
 	</hbox>
 
-	<notebook labels="Installed|Mirrored|Search|Configuration">
+	<notebook labels="Installed|Installable|Mirrored|Search|Configuration">
 
 	<vbox>
 		<tree>
@@ -129,7 +130,7 @@
 			<button>
 				<label>Upgrade all</label>
 				<input file icon="system-software-update"></input>
-				<action>xterm -T "Package upgrade" -geometry 80x16+120+120 -e "tazpkg upgrade; sleep 2"</action>
+				<action>xterm -T "Package upgrade" -geometry 80x16+120+120 -e "tazpkg upgrade; sleep 2" 2>/dev/null</action>
 				<action>refresh:PKG</action>
 				<action>refresh:PKG_STATS</action>
 				<action>refresh:CACHE_STATS</action>
@@ -140,6 +141,56 @@
 	<vbox>
 		<tree>
 			<width>620</width><height>240</height>
+			<variable>GETIT</variable>
+			<label>Package name|Version|Description</label>
+			<input>/usr/lib/slitaz/tazpkgbox/list installable</input>
+			<action>echo "$GETIT" > /tmp/tazpkgbox/pkg</action>
+			<action>/usr/lib/slitaz/tazpkgbox/package_infos</action>
+			<action>refresh:PKG</action>
+			<action>refresh:GETIT</action>
+			<action>refresh:PKG_STATS</action>
+			<action>refresh:CACHE_STATS</action>
+		</tree>
+		<hbox>
+			<text>
+				<label>"Category:"</label>
+			</text>
+			<combobox>
+				<variable>INSTALLABLE_CAT</variable>
+				<item>all</item>
+				<item>base-system</item>
+				<item>utilities</item>
+				<item>network</item>
+				<item>graphics</item>
+				<item>multimedia</item>
+				<item>office</item>
+				<item>development</item>
+				<item>system-tools</item>
+				<item>security</item>
+				<item>games</item>
+				<item>misc</item>
+				<item>meta</item>
+				<item>non-free</item>
+			</combobox>
+			<button>
+				<label>List</label>
+				<input file icon="reload"></input>
+				<action>echo "$INSTALLABLE_CAT" > /tmp/tazpkgbox/installable-category</action>
+				<action>refresh:GETIT</action>
+			</button>
+			<button>
+				<label>Recharge list</label>
+				<input file icon="system-software-update"></input>
+				<action>xterm -T "Recharge" -geometry 80x16+120+120 -e "tazpkg recharge; sleep 2" 2>/dev/null</action>
+				<action>refresh:GETIT</action>
+				<action>refresh:PKG_STATS</action>
+			</button>
+		</hbox>
+	</vbox>
+
+	<vbox>
+		<tree>
+			<width>620</width><height>240</height>
 			<variable>GET</variable>
 			<label>Package name|Version|Description</label>
 			<input>/usr/lib/slitaz/tazpkgbox/list mirrored</input>
@@ -176,7 +227,7 @@
 			<button>
 				<label>Recharge list</label>
 				<input file icon="system-software-update"></input>
-				<action>xterm -T "Recharge" -geometry 80x16+120+120 -e "tazpkg recharge; sleep 2"</action>
+				<action>xterm -T "Recharge" -geometry 80x16+120+120 -e "tazpkg recharge; sleep 2" 2>/dev/null</action>
 				<action>refresh:GET</action>
 				<action>refresh:PKG_STATS</action>
 			</button>
@@ -285,12 +336,12 @@
 				<button>
 					<label>Quick check</label>
 					<input file icon="go-next"></input>
-					<action>xterm -fa MiscFixed -fs 11 -bg gray93 -fg black -T "Check packages (q to quit)" -geometry 80x25+120+120 -e "tazpkg check | less "</action>
+					<action>xterm -fa MiscFixed -fs 11 -bg gray93 -fg black -T "Check packages (q to quit)" -geometry 80x25+120+120 -e "tazpkg check | less " 2> /dev/null</action>
 				</button>
 				<button>
 					<label>Full check</label>
 					<input file icon="go-next"></input>
-					<action>xterm -fa MiscFixed -fs 11 -bg gray93 -fg black -T "Check packages (q to quit)" -geometry 80x25+120+120 -e "tazpkg check --full | less "</action>
+					<action>xterm -fa MiscFixed -fs 11 -bg gray93 -fg black -T "Check packages (q to quit)" -geometry 80x25+120+120 -e "tazpkg check --full | less " 2> /dev/null</action>
 				</button>
 			</hbox>
 		</frame>
@@ -300,7 +351,7 @@
 
 	<hbox>
 		<text>
-			<input>echo "Packages: `ls /var/lib/tazpkg/installed | wc -l` installed, `cat /var/lib/tazpkg/packages.list | wc -l` mirrored, `cat /var/lib/tazpkg/upradable-packages.list | wc -l` to upgrade "</input>
+			<input>echo "Packages: `ls /var/lib/tazpkg/installed | wc -l` installed, `cat /var/lib/tazpkg/packages.list | wc -l` mirrored, `cat /var/lib/tazpkg/upradable-packages.list 2> /dev/null | wc -l` to upgrade "</input>
 			<variable>PKG_STATS</variable>
 		</text>
 	</hbox>