# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1427641449 -7200
# Node ID 37df6365cf419bab8c39ea027f128de8861da717
# Parent  47f112cf1ad02bc55ffe37ccdc89956fe31a12e4
Search in extra.list too

diff -r 47f112cf1ad0 -r 37df6365cf41 modules/tazpkg-convert
--- a/modules/tazpkg-convert	Fri Mar 27 15:06:01 2015 +0200
+++ b/modules/tazpkg-convert	Sun Mar 29 17:04:09 2015 +0200
@@ -223,7 +223,7 @@
 		mv fs $file
 		cat > $file/receipt <<EOT
 # SliTaz package receipt.
-# generated by tazpkg from Archlinux package $(basename $PACKAGE_FILE)
+# generated by tazpkg from NuTyX package $(basename $PACKAGE_FILE)
 PACKAGE="$package"
 VERSION="$version"
 CATEGORY="misc"
diff -r 47f112cf1ad0 -r 37df6365cf41 tazpanel/pkgs.cgi
--- a/tazpanel/pkgs.cgi	Fri Mar 27 15:06:01 2015 +0200
+++ b/tazpanel/pkgs.cgi	Sun Mar 29 17:04:09 2015 +0200
@@ -314,7 +314,8 @@
 		[ -e "$i/blocked-packages.list" ] && cat $i/blocked-packages.list
 		sed 's|.*|&\ti|' $i/installed.info
 		[ "$cat" == 'extra' ] || [ $1 == 'my' ] || cat $i/packages.info
-		[ "$cat" == 'extra' ] && sed 's|.*|&\t-\textra\t-\thttp://mirror.slitaz.org/packages/get/&\t-\t-\t-|' $PKGS_DB/extra.list
+		[ "$cat" == 'extra' ] &&
+		sed 's,\([^|]*\)|*\([^|]*\).*,\1\t-\textra\t\2\thttp://mirror.slitaz.org/packages/get/\1\t-\t-\t-,' $PKGS_DB/extra.list
 	} | sort -t$'\t' -k1,1 | sed '/^$/d' | awk -F$'\t' -vc="${cat:--}" -vt="${tag:--}" '
 {
 	if (PKG && PKG != $1) {
diff -r 47f112cf1ad0 -r 37df6365cf41 tazpkg
--- a/tazpkg	Fri Mar 27 15:06:01 2015 +0200
+++ b/tazpkg	Sun Mar 29 17:04:09 2015 +0200
@@ -1117,7 +1117,8 @@
 	separator
 	num=0
 	BPATTERN="$(emsg "<b>$PATTERN</b>")"
-	for i in $PKGS_DB/packages.list $PKGS_DB/undigest/*/packages.list; do
+	for i in $PKGS_DB/packages.list $PKGS_DB/undigest/*/packages.list \
+		 $PKGS_DB/extra.list $PKGS_DB/undigest/*/extra.list ; do
 		grep -is "$PATTERN" $i | sed "s|$PATTERN|$BPATTERN|"
 		num=$(($num + `grep -is "$PATTERN" $i | wc -l`))
 	done