SliTaz Repositories

     1.1 --- a/tazpanel/pkgs.cgi	Tue Dec 16 15:32:09 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

     2.1 --- a/tazpkg	Tue Dec 16 15:32:09 2014 +0000
     2.2 +++ b/tazpkg	Wed Dec 17 01:59:31 2014 +0200
     2.3 @@ -136,6 +136,11 @@
     2.4  ####################
     2.5  
     2.6  
     2.7 +# Interactive mode
     2.8 +
     2.9 +im() { tty -s; }
    2.10 +
    2.11 +
    2.12  # Print the usage.
    2.13  
    2.14  usage () {
    2.15 @@ -1463,7 +1468,7 @@
    2.16  		check_for_receipt
    2.17  		EXTRAVERSION=""
    2.18  		. $INSTALLED/$PACKAGE/receipt
    2.19 -		title 'TazPKG information'
    2.20 +		im && title 'TazPKG information'
    2.21  		# Display localized short description
    2.22  		for LC in $LANG ${LANG%_*}; do
    2.23  			if [ -e "$PKGS_DB/packages-desc.$LC" ]; then
    2.24 @@ -1486,21 +1491,22 @@
    2.25  			_ 'Web site   : %s' "$WEB_SITE"
    2.26  			_ 'Tags       : %s' "$TAGS"
    2.27  		} | sed '/: $/d; s|^\([^:]*\):|<b>\1:</b>|')"
    2.28 -		footer ;;
    2.29 +		im && footer
    2.30 +		;;
    2.31  
    2.32  
    2.33  	desc)
    2.34 -		# Display package description.txt if available.
    2.35 +		# Display package description
    2.36  		if [ -n "$(grep -e "^$PACKAGE	" $PKGS_DB/installed.info)" ]; then
    2.37 -			title 'Description of package "%s"' $PACKAGE
    2.38 +			im && title 'Description of package "%s"' $PACKAGE
    2.39  			if [ -f "$INSTALLED/$PACKAGE/description.txt" ]; then
    2.40  				cat $INSTALLED/$PACKAGE/description.txt
    2.41  			else
    2.42 -				awk -F$'\t' '{if ($1 == "'$PACKAGE'") print $4}' $PKGS_DB/installed.info
    2.43 +				im && awk -F$'\t' '{if ($1 == "'$PACKAGE'") print $4}' $PKGS_DB/installed.info
    2.44  			fi
    2.45 -			footer
    2.46 +			im && footer
    2.47  		else
    2.48 -			_ 'Package "%s" is not installed.' "$PACKAGE"
    2.49 +			im && _ 'Package "%s" is not installed.' "$PACKAGE"
    2.50  		fi
    2.51  		;;
    2.52