# HG changeset patch # User Antoine Bodin # Date 1302100633 -7200 # Node ID 9b76fd8285e51392ef3bfc42272022aa1a45d115 # Parent 5f9f0aceea965435d536673bf8bf7e6c992646eb recharge(): fix some details to make it run smooth in various usage cases diff -r 5f9f0aceea96 -r 9b76fd8285e5 tazpkg --- a/tazpkg Wed Apr 06 16:15:04 2011 +0200 +++ b/tazpkg Wed Apr 06 16:37:13 2011 +0200 @@ -2244,7 +2244,7 @@ # Quietly check if recharging is needed. [ -f ID ] && mv ID ID.bak - download_from "$(cat mirror)" ID >/dev/null + download_from "$(cat mirror)" ID >/dev/null 2>/dev/null if [ -f ID ] && fgrep -q `cat ID.bak 2>/dev/null || echo "null"` ID; then if [ "$path" = "$LOCALSTATE" ]; then repository_name=Main @@ -2270,16 +2270,18 @@ if [ -f "packages.list" ]; then gettext "Creating backup of the last packages list..." - for i in packages.desc packages.md5 packages.txt \ + for i in wanted.txt depends.txt libraries.txt \ + packages.desc packages.md5 packages.txt \ packages.list packages.equiv files.list.lzma \ - mirrors wanted.txt depends.txt libraries.txt; do + mirrors; do mv -f $i $i.bak 2>/dev/null done status fi - for i in desc md5 txt list; do + for i in desc md5 txt list equiv; do download_from "$(cat mirror)" packages.$i done + download_from "$(cat mirror)" files.list.lzma # ID file & wanted/depends/libraries files were implemented @@ -2290,6 +2292,7 @@ done fi + download_from "$(sed 's|packages/.*||' < mirror)" mirrors [ -f mirrors ] || mv mirrors.bak mirrors 2> /dev/null suffix=$(head -1 mirror) suffix=packages${suffix#*/packages}