tazpkg diff tazpanel/pkgs.cgi @ rev 717
pkgs.cgi: fix i18n_desc, show package description in info (use tazpkg); tazpkg: recognize interactive mode.
author | Aleksej Bobylev <al.bobylev@gmail.com> |
---|---|
date | Wed Dec 17 01:59:31 2014 +0200 (2014-12-17) |
parents | 5cfba8b15016 |
children | 9081585e7446 |
line diff
1.1 --- a/tazpanel/pkgs.cgi Tue Dec 16 13:53:49 2014 +0000 1.2 +++ b/tazpanel/pkgs.cgi Wed Dec 17 01:59:31 2014 +0200 1.3 @@ -30,10 +30,15 @@ 1.4 1.5 i18n_desc() { 1.6 # Display localized short description 1.7 - if [ -e "$PKGS_DB/packages-desc.$LANG" ]; then 1.8 - LOCDESC=$(grep -e "^$pkg " $PKGS_DB/packages-desc.$LANG | cut -d' ' -f2) 1.9 - [ "x$LOCDESC" != "x" ] && SHORT_DESC="$LOCDESC" 1.10 - fi 1.11 + for L in $LANG ${LANG%%_*}; do 1.12 + if [ -e "$PKGS_DB/packages-desc.$L" ]; then 1.13 + LOCDESC=$(awk -F$'\t' -vp=$pkg '{if ($1 == p) print $2}' $PKGS_DB/packages-desc.$L) 1.14 + if [ -n "$LOCDESC" ]; then 1.15 + SHORT_DESC="$LOCDESC" 1.16 + break 1.17 + fi 1.18 + fi 1.19 + done 1.20 } 1.21 1.22 1.23 @@ -736,10 +741,14 @@ 1.24 cat << EOT 1.25 </tbody> 1.26 </table> 1.27 +EOT 1.28 + DESC="$(tazpkg desc $pkg)" 1.29 + [ -n "$DESC" ] && echo "<pre>$DESC</pre>" 1.30 1.31 + cat << EOT 1.32 <p>$(_ 'Installed files: %s' $I_FILES)</p> 1.33 1.34 -<pre>$(cat $INSTALLED/$pkg/files.list)</pre> 1.35 +<pre>$(sort $INSTALLED/$pkg/files.list)</pre> 1.36 EOT 1.37 else 1.38 cat << EOT 1.39 @@ -751,8 +760,8 @@ 1.40 <p>$(_ 'Installed files:')</p> 1.41 1.42 <pre> 1.43 -`unlzma -c files.list.lzma undigest/*/files.list.lzma 2> /dev/null | \ 1.44 - sed "/^$pkg: /!d;s/^$pkg: //"` 1.45 +$(lzcat files.list.lzma undigest/*/files.list.lzma 2> /dev/null | \ 1.46 + sed "/^$pkg: /!d;s/^$pkg: //" | sort) 1.47 </pre> 1.48 EOT 1.49 fi