tazpkg rev 760
Search in extra.list too
author | Pascal Bellard <pascal.bellard@slitaz.org> |
---|---|
date | Sun Mar 29 17:04:09 2015 +0200 (2015-03-29) |
parents | 47f112cf1ad0 |
children | 98c62c676216 |
files | modules/tazpkg-convert tazpanel/pkgs.cgi tazpkg |
line diff
1.1 --- a/modules/tazpkg-convert Fri Mar 27 15:06:01 2015 +0200 1.2 +++ b/modules/tazpkg-convert Sun Mar 29 17:04:09 2015 +0200 1.3 @@ -223,7 +223,7 @@ 1.4 mv fs $file 1.5 cat > $file/receipt <<EOT 1.6 # SliTaz package receipt. 1.7 -# generated by tazpkg from Archlinux package $(basename $PACKAGE_FILE) 1.8 +# generated by tazpkg from NuTyX package $(basename $PACKAGE_FILE) 1.9 PACKAGE="$package" 1.10 VERSION="$version" 1.11 CATEGORY="misc"
2.1 --- a/tazpanel/pkgs.cgi Fri Mar 27 15:06:01 2015 +0200 2.2 +++ b/tazpanel/pkgs.cgi Sun Mar 29 17:04:09 2015 +0200 2.3 @@ -314,7 +314,8 @@ 2.4 [ -e "$i/blocked-packages.list" ] && cat $i/blocked-packages.list 2.5 sed 's|.*|&\ti|' $i/installed.info 2.6 [ "$cat" == 'extra' ] || [ $1 == 'my' ] || cat $i/packages.info 2.7 - [ "$cat" == 'extra' ] && sed 's|.*|&\t-\textra\t-\thttp://mirror.slitaz.org/packages/get/&\t-\t-\t-|' $PKGS_DB/extra.list 2.8 + [ "$cat" == 'extra' ] && 2.9 + sed 's,\([^|]*\)|*\([^|]*\).*,\1\t-\textra\t\2\thttp://mirror.slitaz.org/packages/get/\1\t-\t-\t-,' $PKGS_DB/extra.list 2.10 } | sort -t$'\t' -k1,1 | sed '/^$/d' | awk -F$'\t' -vc="${cat:--}" -vt="${tag:--}" ' 2.11 { 2.12 if (PKG && PKG != $1) {
3.1 --- a/tazpkg Fri Mar 27 15:06:01 2015 +0200 3.2 +++ b/tazpkg Sun Mar 29 17:04:09 2015 +0200 3.3 @@ -1117,7 +1117,8 @@ 3.4 separator 3.5 num=0 3.6 BPATTERN="$(emsg "<b>$PATTERN</b>")" 3.7 - for i in $PKGS_DB/packages.list $PKGS_DB/undigest/*/packages.list; do 3.8 + for i in $PKGS_DB/packages.list $PKGS_DB/undigest/*/packages.list \ 3.9 + $PKGS_DB/extra.list $PKGS_DB/undigest/*/extra.list ; do 3.10 grep -is "$PATTERN" $i | sed "s|$PATTERN|$BPATTERN|" 3.11 num=$(($num + `grep -is "$PATTERN" $i | wc -l`)) 3.12 done