tazpkg rev 458 4.3
recharge(): fix some details to make it run smooth in various usage cases
author | Antoine Bodin <gokhlayeh@slitaz.org> |
---|---|
date | Wed Apr 06 16:37:13 2011 +0200 (2011-04-06) |
parents | 5f9f0aceea96 |
children | 68f72d0a2b3a |
files | tazpkg |
line diff
1.1 --- a/tazpkg Wed Apr 06 16:15:04 2011 +0200 1.2 +++ b/tazpkg Wed Apr 06 16:37:13 2011 +0200 1.3 @@ -2244,7 +2244,7 @@ 1.4 1.5 # Quietly check if recharging is needed. 1.6 [ -f ID ] && mv ID ID.bak 1.7 - download_from "$(cat mirror)" ID >/dev/null 1.8 + download_from "$(cat mirror)" ID >/dev/null 2>/dev/null 1.9 if [ -f ID ] && fgrep -q `cat ID.bak 2>/dev/null || echo "null"` ID; then 1.10 if [ "$path" = "$LOCALSTATE" ]; then 1.11 repository_name=Main 1.12 @@ -2270,16 +2270,18 @@ 1.13 1.14 if [ -f "packages.list" ]; then 1.15 gettext "Creating backup of the last packages list..." 1.16 - for i in packages.desc packages.md5 packages.txt \ 1.17 + for i in wanted.txt depends.txt libraries.txt \ 1.18 + packages.desc packages.md5 packages.txt \ 1.19 packages.list packages.equiv files.list.lzma \ 1.20 - mirrors wanted.txt depends.txt libraries.txt; do 1.21 + mirrors; do 1.22 mv -f $i $i.bak 2>/dev/null 1.23 done 1.24 status 1.25 fi 1.26 - for i in desc md5 txt list; do 1.27 + for i in desc md5 txt list equiv; do 1.28 download_from "$(cat mirror)" packages.$i 1.29 done 1.30 + 1.31 download_from "$(cat mirror)" files.list.lzma 1.32 1.33 # ID file & wanted/depends/libraries files were implemented 1.34 @@ -2290,6 +2292,7 @@ 1.35 done 1.36 fi 1.37 1.38 + download_from "$(sed 's|packages/.*||' < mirror)" mirrors 1.39 [ -f mirrors ] || mv mirrors.bak mirrors 2> /dev/null 1.40 suffix=$(head -1 mirror) 1.41 suffix=packages${suffix#*/packages}