SliTaz Repositories

     1.1 --- a/tazpanel/pkgs.cgi	Tue Dec 23 16:20:16 2014 +0200
     1.2 +++ b/tazpanel/pkgs.cgi	Tue Dec 23 16:25:43 2014 +0200
     1.3 @@ -261,6 +261,21 @@
     1.4  	esac
     1.5  }
     1.6  
     1.7 +make_mixed_list() {
     1.8 +	for L in $LANG ${LANG%%_*}; do
     1.9 +		if [ -e "$PKGS_DB/packages-desc.$L" ]; then
    1.10 +			sed '/^#/d' $PKGS_DB/packages-desc.$L
    1.11 +			break
    1.12 +		fi
    1.13 +	done
    1.14 +
    1.15 +	[ -e "$i/blocked-packages.list" ] && cat $i/blocked-packages.list
    1.16 +
    1.17 +	sed 's|.*|&\ti|' $i/installed.info
    1.18 +
    1.19 +	cat $i/packages.info
    1.20 +}
    1.21 +
    1.22  
    1.23  
    1.24  #
    1.25 @@ -426,20 +441,7 @@
    1.26  					$i/extra.list | parse_packages_info
    1.27  					;;
    1.28  				all)
    1.29 -					{
    1.30 -						for L in $LANG ${LANG%%_*}; do
    1.31 -							if [ -e "$PKGS_DB/packages-desc.$L" ]; then
    1.32 -								sed '/^#/d' $PKGS_DB/packages-desc.$L
    1.33 -								break
    1.34 -							fi
    1.35 -						done
    1.36 -
    1.37 -						[ -e "$i/blocked-packages.list" ] && cat $i/blocked-packages.list
    1.38 -
    1.39 -						sed 's|.*|&\ti|' $i/installed.info
    1.40 -
    1.41 -						cat $i/packages.info
    1.42 -					} | sort -t$'\t' -k1,1 | awk -F$'\t' '
    1.43 +					make_mixed_list | sort -t$'\t' -k1,1 | awk -F$'\t' '
    1.44  {
    1.45  	if (PKG && PKG != $1) {
    1.46  		if (DSCL) DSC = DSCL
    1.47 @@ -455,20 +457,7 @@
    1.48  }'
    1.49  					;;
    1.50  				*)
    1.51 -					{
    1.52 -						for L in $LANG ${LANG%%_*}; do
    1.53 -							if [ -e "$PKGS_DB/packages-desc.$L" ]; then
    1.54 -								sed '/^#/d' $PKGS_DB/packages-desc.$L
    1.55 -								break
    1.56 -							fi
    1.57 -						done
    1.58 -
    1.59 -						[ -e "$i/blocked-packages.list" ] && cat $i/blocked-packages.list
    1.60 -
    1.61 -						sed 's|.*|&\ti|' $i/installed.info
    1.62 -
    1.63 -						cat $i/packages.info
    1.64 -					} | sort -t$'\t' -k1,1 | awk -F$'\t' -vc="$category" '
    1.65 +					make_mixed_list | sort -t$'\t' -k1,1 | awk -F$'\t' -vc="$category" '
    1.66  {
    1.67  	if (PKG && PKG != $1) {
    1.68  		if (CAT) {