tazpkg rev 841

pkgs.cgi: show blocked icon on "info" page for blocked depends/suggests
author Aleksej Bobylev <al.bobylev@gmail.com>
date Fri Aug 28 17:19:09 2015 +0300 (2015-08-28)
parents a02e36d44d06
children 0560ba4306a1
files tazpanel/pkgs.cgi
line diff
     1.1 --- a/tazpanel/pkgs.cgi	Fri Aug 28 16:10:34 2015 +0300
     1.2 +++ b/tazpanel/pkgs.cgi	Fri Aug 28 17:19:09 2015 +0300
     1.3 @@ -85,11 +85,10 @@
     1.4  		# Space at end is flag -> do not check equivalents
     1.5  		pkg=$(GET pkg | tr -d ' ')
     1.6  		orig_pkg=''
     1.7 +		# Small hack to get 'pkgi' symbol:
     1.8 +		data_icon="pkgi"; pkgi="$data_icon"
     1.9  
    1.10 -		if grep -q "^$pkg"$'\t' "$PKGS_DB/installed.info"; then
    1.11 -			# Package installed
    1.12 -			data_icon="pkgi"
    1.13 -		else
    1.14 +		if ! grep -q "^$pkg"$'\t' "$PKGS_DB/installed.info"; then
    1.15  			# Package not installed
    1.16  			data_icon="pkg"
    1.17  			equivs=$(grep "^$pkg=" "$PKGS_DB/packages.equiv")
    1.18 @@ -114,7 +113,7 @@
    1.19  		fi
    1.20  
    1.21  		# Installed and blocked?
    1.22 -		[ "$data_icon" == 'pkgi' ] && grep -q "^$pkg$" "$BLOCKED" && data_icon="pkgib"
    1.23 +		[ "$data_icon" == "$pkgi" ] && grep -q "^$pkg$" "$BLOCKED" && data_icon="pkgib"
    1.24  
    1.25  		header
    1.26  		echo -n "<a data-icon=\"$data_icon\" href=\"?info=${pkg//+/%2B}\">$orig_pkg$pkg</a>"
    1.27 @@ -859,13 +858,6 @@
    1.28  EOT
    1.29  
    1.30  		tazpkg up -c
    1.31 -#		# Ask tazpkg to make "packages.up" file
    1.32 -#		tazpkg up --check >/dev/null
    1.33 -#		table_head
    1.34 -
    1.35 -#		for pkg in $(cat $PKGS_DB/packages.up); do
    1.36 -#			grep -hs "^$pkg	" $PKGS_DB/packages.info $PKGS_DB/undigest/*/packages.info | parse_packages_info
    1.37 -#		done
    1.38  
    1.39  		cat <<EOT
    1.40  </form>