tazpkg rev 882
pkgs.cgi: revert rev. #867. Note cgi (and css) is compiled using stripall.sh (see lines 45-47) for working in Opera browser
author | Aleksej Bobylev <al.bobylev@gmail.com> |
---|---|
date | Fri Dec 04 05:07:12 2015 +0200 (2015-12-04) |
parents | 847a0d1f8f24 |
children | f9b5a4545fff |
files | tazpanel/pkgs.cgi |
line diff
1.1 --- a/tazpanel/pkgs.cgi Fri Dec 04 03:41:00 2015 +0200 1.2 +++ b/tazpanel/pkgs.cgi Fri Dec 04 05:07:12 2015 +0200 1.3 @@ -243,7 +243,11 @@ 1.4 parse_packages_info() { 1.5 IFS=$'\t' 1.6 while read PACKAGE VERSION CATEGORY SHORT_DESC WEB_SITE TAGS SIZES DEPENDS; do 1.7 - data_icon="$(select_package_icon "$PACKAGE")" 1.8 + data_icon="pkg" 1.9 + if grep -q "^$PACKAGE"$'\t' "$PKGS_DB/installed.info"; then 1.10 + data_icon="pkgi" 1.11 + grep -q "^$PACKAGE$" "$BLOCKED" && data_icon="pkgib" 1.12 + fi 1.13 i18n_desc "$PACKAGE" 1.14 cat <<EOT 1.15 <tr> 1.16 @@ -818,7 +822,11 @@ 1.17 lzcat $(repo_list /files.list.lzma) | grep -Ei ": .*$(GET search)" | \ 1.18 while read PACKAGE FILE; do 1.19 PACKAGE=${PACKAGE%:} 1.20 - data_icon="$(select_package_icon "$PACKAGE")" 1.21 + data_icon="pkg" 1.22 + if [ -d $INSTALLED/$PACKAGE ]; then 1.23 + data_icon="pkgi" 1.24 + grep -q "^$PACKAGE$" "$BLOCKED" && data_icon="pkgib" 1.25 + fi 1.26 cat <<EOT 1.27 <tr> 1.28 <td><input type="checkbox" name="pkg" value="$PACKAGE">$(pkg_info_link "$PACKAGE" "$data_icon")</td> 1.29 @@ -977,7 +985,13 @@ 1.30 fi 1.31 1.32 # Symbolic icon 1.33 - data_icon="$(select_package_icon "$pkg")" 1.34 + if [ -d "$INSTALLED/$pkg" ]; then 1.35 + if grep -q "^$pkg$" "$BLOCKED" 1.36 + then data_icon="pkgib" 1.37 + else data_icon="pkgi" 1.38 + fi 1.39 + else data_icon="pkg" 1.40 + fi 1.41 1.42 cat <<EOT 1.43 <section>