# HG changeset patch
# User Aleksej Bobylev <al.bobylev@gmail.com>
# Date 1419344743 -7200
# Node ID c17a5059333568f6d1a65dee9df28800211bc2fb
# Parent  8533790f32ff1554514b9220783f0f144aea82e4
pkgs.cgi: separate common code into function.

diff -r 8533790f32ff -r c17a50593335 tazpanel/pkgs.cgi
--- a/tazpanel/pkgs.cgi	Tue Dec 23 16:20:16 2014 +0200
+++ b/tazpanel/pkgs.cgi	Tue Dec 23 16:25:43 2014 +0200
@@ -261,6 +261,21 @@
 	esac
 }
 
+make_mixed_list() {
+	for L in $LANG ${LANG%%_*}; do
+		if [ -e "$PKGS_DB/packages-desc.$L" ]; then
+			sed '/^#/d' $PKGS_DB/packages-desc.$L
+			break
+		fi
+	done
+
+	[ -e "$i/blocked-packages.list" ] && cat $i/blocked-packages.list
+
+	sed 's|.*|&\ti|' $i/installed.info
+
+	cat $i/packages.info
+}
+
 
 
 #
@@ -426,20 +441,7 @@
 					$i/extra.list | parse_packages_info
 					;;
 				all)
-					{
-						for L in $LANG ${LANG%%_*}; do
-							if [ -e "$PKGS_DB/packages-desc.$L" ]; then
-								sed '/^#/d' $PKGS_DB/packages-desc.$L
-								break
-							fi
-						done
-
-						[ -e "$i/blocked-packages.list" ] && cat $i/blocked-packages.list
-
-						sed 's|.*|&\ti|' $i/installed.info
-
-						cat $i/packages.info
-					} | sort -t$'\t' -k1,1 | awk -F$'\t' '
+					make_mixed_list | sort -t$'\t' -k1,1 | awk -F$'\t' '
 {
 	if (PKG && PKG != $1) {
 		if (DSCL) DSC = DSCL
@@ -455,20 +457,7 @@
 }'
 					;;
 				*)
-					{
-						for L in $LANG ${LANG%%_*}; do
-							if [ -e "$PKGS_DB/packages-desc.$L" ]; then
-								sed '/^#/d' $PKGS_DB/packages-desc.$L
-								break
-							fi
-						done
-
-						[ -e "$i/blocked-packages.list" ] && cat $i/blocked-packages.list
-
-						sed 's|.*|&\ti|' $i/installed.info
-
-						cat $i/packages.info
-					} | sort -t$'\t' -k1,1 | awk -F$'\t' -vc="$category" '
+					make_mixed_list | sort -t$'\t' -k1,1 | awk -F$'\t' -vc="$category" '
 {
 	if (PKG && PKG != $1) {
 		if (CAT) {