# HG changeset patch
# User Aleksej Bobylev <al.bobylev@gmail.com>
# Date 1418774371 -7200
# Node ID 1dea2235808cef3526760e5243ccaf47735229a5
# Parent  981130cf2d6160c30a8c61f9ad4b110504c30c62
pkgs.cgi: fix i18n_desc, show package description in info (use tazpkg); tazpkg: recognize interactive mode.

diff -r 981130cf2d61 -r 1dea2235808c tazpanel/pkgs.cgi
--- a/tazpanel/pkgs.cgi	Tue Dec 16 15:32:09 2014 +0000
+++ b/tazpanel/pkgs.cgi	Wed Dec 17 01:59:31 2014 +0200
@@ -30,10 +30,15 @@
 
 i18n_desc() {
 	# Display localized short description
-	if [ -e "$PKGS_DB/packages-desc.$LANG" ]; then
-		LOCDESC=$(grep -e "^$pkg	" $PKGS_DB/packages-desc.$LANG | cut -d'	' -f2)
-	[ "x$LOCDESC" != "x" ] && SHORT_DESC="$LOCDESC"
-	fi
+	for L in $LANG ${LANG%%_*}; do
+		if [ -e "$PKGS_DB/packages-desc.$L" ]; then
+			LOCDESC=$(awk -F$'\t' -vp=$pkg '{if ($1 == p) print $2}' $PKGS_DB/packages-desc.$L)
+			if [ -n "$LOCDESC" ]; then
+				SHORT_DESC="$LOCDESC"
+				break
+			fi
+		fi
+	done
 }
 
 
@@ -736,10 +741,14 @@
 			cat << EOT
 </tbody>
 </table>
+EOT
+			DESC="$(tazpkg desc $pkg)"
+			[ -n "$DESC" ] && echo "<pre>$DESC</pre>"
 
+			cat << EOT
 <p>$(_ 'Installed files: %s' $I_FILES)</p>
 
-<pre>$(cat $INSTALLED/$pkg/files.list)</pre>
+<pre>$(sort $INSTALLED/$pkg/files.list)</pre>
 EOT
 		else
 			cat << EOT
@@ -751,8 +760,8 @@
 <p>$(_ 'Installed files:')</p>
 
 <pre>
-`unlzma -c files.list.lzma undigest/*/files.list.lzma 2> /dev/null | \
- sed "/^$pkg: /!d;s/^$pkg: //"`
+$(lzcat files.list.lzma undigest/*/files.list.lzma 2> /dev/null | \
+ sed "/^$pkg: /!d;s/^$pkg: //" | sort)
 </pre>
 EOT
 		fi
diff -r 981130cf2d61 -r 1dea2235808c tazpkg
--- a/tazpkg	Tue Dec 16 15:32:09 2014 +0000
+++ b/tazpkg	Wed Dec 17 01:59:31 2014 +0200
@@ -136,6 +136,11 @@
 ####################
 
 
+# Interactive mode
+
+im() { tty -s; }
+
+
 # Print the usage.
 
 usage () {
@@ -1463,7 +1468,7 @@
 		check_for_receipt
 		EXTRAVERSION=""
 		. $INSTALLED/$PACKAGE/receipt
-		title 'TazPKG information'
+		im && title 'TazPKG information'
 		# Display localized short description
 		for LC in $LANG ${LANG%_*}; do
 			if [ -e "$PKGS_DB/packages-desc.$LC" ]; then
@@ -1486,21 +1491,22 @@
 			_ 'Web site   : %s' "$WEB_SITE"
 			_ 'Tags       : %s' "$TAGS"
 		} | sed '/: $/d; s|^\([^:]*\):|<b>\1:</b>|')"
-		footer ;;
+		im && footer
+		;;
 
 
 	desc)
-		# Display package description.txt if available.
+		# Display package description
 		if [ -n "$(grep -e "^$PACKAGE	" $PKGS_DB/installed.info)" ]; then
-			title 'Description of package "%s"' $PACKAGE
+			im && title 'Description of package "%s"' $PACKAGE
 			if [ -f "$INSTALLED/$PACKAGE/description.txt" ]; then
 				cat $INSTALLED/$PACKAGE/description.txt
 			else
-				awk -F$'\t' '{if ($1 == "'$PACKAGE'") print $4}' $PKGS_DB/installed.info
+				im && awk -F$'\t' '{if ($1 == "'$PACKAGE'") print $4}' $PKGS_DB/installed.info
 			fi
-			footer
+			im && footer
 		else
-			_ 'Package "%s" is not installed.' "$PACKAGE"
+			im && _ 'Package "%s" is not installed.' "$PACKAGE"
 		fi
 		;;