SliTaz Repositories

     1.1 --- a/lib/tazpkgbox/list	Mon May 25 20:07:00 2009 +0200
     1.2 +++ b/lib/tazpkgbox/list	Mon May 25 21:36:28 2009 +0200
     1.3 @@ -34,9 +34,8 @@
     1.4  		# Check first for category for more speed.
     1.5  		CATEGORY=${CATEGORY%| *}
     1.6  		ICON=tazpkg
     1.7 -		if [ "$CAT" == "all" ] || [ "$CATEGORY" == " $CAT " ]; then
     1.8 -			[ -d /var/lib/tazpkg/installed/${PACKAGE%% *} ] && continue
     1.9 -		fi
    1.10 +		[ "$CAT" == "all" -o "$CATEGORY" == "$CAT" ] || continue
    1.11 +		[ -d /var/lib/tazpkg/installed/${PACKAGE%% *} ] && continue
    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 @@ -61,28 +60,7 @@
    1.16  
    1.17  all_list()
    1.18  {
    1.19 -	IFS="|"
    1.20 -	cat /var/lib/tazpkg/packages.desc \
    1.21 -	    /var/lib/tazpkg/undigest/*/packages.desc 2> /dev/null | sort | \
    1.22 -	while read PACKAGE VERSION SHORT_DESC CATEGORY; do
    1.23 -	# Check first for category for more speed.
    1.24 -	CATEGORY=${CATEGORY%| *}
    1.25 -	if [ "$CAT" == "all" ] || [ "$CATEGORY" == " $CAT " ]; then
    1.26 -		ICON=tazpkg
    1.27 -		if grep -qs "^$PACKAGE" /var/lib/tazpkg/undigest/*/packages.desc ; then
    1.28 -			ICON=add
    1.29 -		fi
    1.30 -		if [ -d /var/lib/tazpkg/installed/${PACKAGE%% *} ]; then
    1.31 -			. /var/lib/tazpkg/installed/${PACKAGE%% *}/receipt
    1.32 -			ICON=tazpkg-installed
    1.33 -			if grep -qs "^$PACKAGE$" /var/lib/tazpkg/blocked-packages.list; then
    1.34 -				ICON=stop
    1.35 -			fi
    1.36 -		fi
    1.37 -		echo "$ICON|$PACKAGE|$VERSION|$SHORT_DESC"
    1.38 -	fi
    1.39 -	done
    1.40 -	unset IFS
    1.41 +	( installable_list ; installed_list ) | sort -t \| -k 2 -u
    1.42  }
    1.43  
    1.44  blocked_list()