tazpkg rev 692 5.3.3
Add extra category (get-scripts common to any SliTaz version)
author | Pascal Bellard <pascal.bellard@slitaz.org> |
---|---|
date | Wed Nov 19 17:15:05 2014 +0100 (2014-11-19) |
parents | 697c7b137c24 |
children | 0dedae7db044 |
files | pkgs.cgi tazpkg |
line diff
1.1 --- a/pkgs.cgi Wed Oct 29 13:07:15 2014 +0200 1.2 +++ b/pkgs.cgi Wed Nov 19 17:15:05 2014 +0100 1.3 @@ -171,6 +171,7 @@ 1.4 <a class="active_meta" href="$SCRIPT_NAME?cat=meta&repo=$repo">$(gettext 'meta')</a> 1.5 <a class="active_non-free" href="$SCRIPT_NAME?cat=non-free&repo=$repo">$(gettext 'non-free')</a> 1.6 <a class="active_all" href="$SCRIPT_NAME?cat=all&repo=$repo">$(gettext 'all')</a> 1.7 + <a class="active_extra" href="$SCRIPT_NAME?cat=extra&repo=$repo">$(gettext 'extra')</a> 1.8 EOT 1.9 1.10 if [ -d $LOCALSTATE/undigest ]; then 1.11 @@ -384,8 +385,11 @@ 1.12 $(table_head) 1.13 <tbody> 1.14 EOT 1.15 - grep "| $grep_category |" $i/packages.desc | \ 1.16 - parse_packages_desc 1.17 + if [ "$category" == "extra" ]; then 1.18 + sed 's,.*,&|--|--|--|http://mirror.slitaz.org/packages/get/&,' $i/extra.list 1.19 + else 1.20 + grep "| $grep_category |" $i/packages.desc 1.21 + fi | parse_packages_desc 1.22 cat << EOT 1.23 </tbody> 1.24 </table>
2.1 --- a/tazpkg Wed Oct 29 13:07:15 2014 +0200 2.2 +++ b/tazpkg Wed Nov 19 17:15:05 2014 +0100 2.3 @@ -2528,7 +2528,7 @@ 2.4 action "Creating backup of the last packages list..." 2.5 for i in packages.desc packages.$SUM packages.txt \ 2.6 packages.list packages.equiv files.list.lzma \ 2.7 - mirrors 2.8 + extra.list mirrors 2.9 do 2.10 mv -f $i $i.bak 2>/dev/null 2.11 done 2.12 @@ -2539,10 +2539,13 @@ 2.13 download_from "$(cat mirror)" packages.$i 2.14 done 2.15 download_from "$(cat mirror)" files.list.lzma 2.16 + download_from "$(cat mirror)" extra.list 2.17 download_from "$(sed 's|packages/.*||' < mirror)" mirrors 2.18 2.19 if [ -f "packages.list.bak" ]; then 2.20 diff -u packages.list.bak packages.list | grep ^+[a-z] > packages.diff 2.21 + [ -f "extra.list.bak" ] && 2.22 + diff -u extra.list.bak extra.list | grep ^+[a-z] >> packages.diff 2.23 sed -i s/+// packages.diff 2.24 title 'Mirrored packages diff' 2.25 cat packages.diff