SliTaz Repositories

     1.1 --- a/lib/tazpkgbox/list	Fri Mar 06 09:55:22 2009 +0000
     1.2 +++ b/lib/tazpkgbox/list	Fri Mar 06 10:13:25 2009 +0000
     1.3 @@ -33,10 +33,13 @@
     1.4  	while read PACKAGE VERSION SHORT_DESC; do
     1.5  		# Check first for category for more speed.
     1.6  		CATEGORY=${CATEGORY%| *}
     1.7 +		ICON=tazpkg
     1.8  		if [ "$CAT" == "all" ] || [ "$CATEGORY" == " $CAT " ]; then
     1.9  			[ -d /var/lib/tazpkg/installed/${PACKAGE%% *} ] && continue
    1.10 -			echo "tazpkg|$PACKAGE|$VERSION|$SHORT_DESC"
    1.11  		fi
    1.12 +		grep -qs "^$PACKAGE" /var/lib/tazpkg/undigest/*/packages.desc &&
    1.13 +			ICON=add
    1.14 +		echo "$ICON|$PACKAGE|$VERSION|$SHORT_DESC"
    1.15  	done
    1.16  	unset IFS
    1.17  }
    1.18 @@ -46,9 +49,13 @@
    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 "tazpkg-installed|$PACKAGE|$VERSION|$SHORT_DESC"
    1.24 -		fi
    1.25 +		ICON=tazpkg-installed
    1.26 +		[ "$CAT" == "all" -o "$CATEGORY" == "$CAT" ] || continue
    1.27 +		grep -qs "^$PACKAGE" /var/lib/tazpkg/undigest/*/packages.desc &&
    1.28 +			ICON=add
    1.29 +		grep -qs "^$PACKAGE$" /var/lib/tazpkg/blocked-packages.list &&
    1.30 +			ICON=stop
    1.31 +		echo "$ICON|$PACKAGE|$VERSION|$SHORT_DESC"
    1.32  	done
    1.33  }
    1.34  
    1.35 @@ -84,7 +91,7 @@
    1.36  	do
    1.37  		. $pkg/receipt
    1.38  		if grep -qs "^$(basename $pkg)$" /var/lib/tazpkg/blocked-packages.list; then
    1.39 -			AVAILABLE=$(grep "^$(basename $pkg) " /var/lib/tazpkg/packages.desc | awk '{ print $3 }')
    1.40 +			AVAILABLE=$(grep -s "^$(basename $pkg) " /var/lib/tazpkg/packages.desc /var/lib/tazpkg/undigest/*/packages.desc | awk '{ print $3 }')
    1.41  			echo "stop|$PACKAGE|$VERSION (Available: $AVAILABLE)|$SHORT_DESC"
    1.42  		fi
    1.43  	done