SliTaz Repositories

     1.1 --- a/lib/tazpkgbox/list	Fri May 09 17:26:15 2008 +0200
     1.2 +++ b/lib/tazpkgbox/list	Sun Aug 31 19:33:50 2008 +0000
     1.3 @@ -4,23 +4,37 @@
     1.4  # List mirrored packages using the packages.desc file.
     1.5  #
     1.6  
     1.7 +installable_list()
     1.8 +{
     1.9 +	IFS="|"
    1.10 +	while read PACKAGE VERSION SHORT_DESC; do
    1.11 +		[ -d /var/lib/tazpkg/installed/${PACKAGE%% *} ] && continue
    1.12 +		echo "$PACKAGE|$VERSION|$SHORT_DESC"
    1.13 +	done < /var/lib/tazpkg/packages.desc 2> /dev/null
    1.14 +	unset IFS
    1.15 +}
    1.16 +
    1.17 +installed_list()
    1.18 +{
    1.19 +	for pkg in /var/lib/tazpkg/installed/*
    1.20 +	do
    1.21 +		. $pkg/receipt
    1.22 +		if [ "$CAT" == "all" -o "$CATEGORY" == "$CAT" ]; then
    1.23 +			echo "$PACKAGE|$VERSION|$SHORT_DESC"
    1.24 +		fi
    1.25 +	done
    1.26 +}
    1.27 +
    1.28  case $1 in
    1.29  	installed)
    1.30  		CAT=`cat /tmp/tazpkgbox/installed-category`
    1.31 +		installed_list $CAT;;
    1.32 +	installable)
    1.33 +		CAT=`cat /tmp/tazpkgbox/installable-category`
    1.34  		if [ "$CAT" == "all" ]; then
    1.35 -			for pkg in /var/lib/tazpkg/installed/*
    1.36 -			do
    1.37 -				. $pkg/receipt
    1.38 -				echo "$PACKAGE|$VERSION|$SHORT_DESC"
    1.39 -			done
    1.40 +			installable_list
    1.41  		else
    1.42 -			for pkg in /var/lib/tazpkg/installed/*
    1.43 -			do
    1.44 -				. $pkg/receipt
    1.45 -				if [ "$CATEGORY" == "$CAT" ]; then
    1.46 -					echo "$PACKAGE|$VERSION|$SHORT_DESC"
    1.47 -				fi
    1.48 -			done	
    1.49 +			installable_list | grep "$CAT"
    1.50  		fi ;;
    1.51  	mirrored)
    1.52  		CAT=`cat /tmp/tazpkgbox/mirrored-category`
    1.53 @@ -28,20 +42,9 @@
    1.54  			cat /var/lib/tazpkg/packages.desc
    1.55  		else
    1.56  			grep "$CAT" /var/lib/tazpkg/packages.desc
    1.57 -			#for pkg in `grep "$CAT" /var/lib/tazpkg/packages.desc | cut -d "|" -f 1`
    1.58 -			#do
    1.59 -				#RES=`grep "^$pkg"  /var/lib/tazpkg/packages.desc | head -n 1`
    1.60 -				#CATEGORY=`echo "$RES" | cut -d "|" -f 4`
    1.61 -				##echo "$pkg|$CATEGORY"
    1.62 -				#if [ "$CATEGORY" == "$CAT" ]; then
    1.63 -					#VERSION=`echo $RES | cut -d "|" -f 2`
    1.64 -					#SHORT_DESC=`echo $RES | cut -d "|" -f 3`
    1.65 -					#echo "$pkg | $VERSION | $SHORT_DESC"
    1.66 -				#fi
    1.67 -			#done
    1.68  		fi ;;
    1.69  	*)
    1.70 -		echo "Usage: /usr/lib/slitaz/tazpkgbox/list [installed|mirrored]" ;;
    1.71 +		echo "Usage: /usr/lib/slitaz/tazpkgbox/list [installed|installable|mirrored]" ;;
    1.72  esac
    1.73  
    1.74  exit 0