# HG changeset patch # User Christophe Lincoln # Date 1333622625 -7200 # Node ID 1261d89830ee94e96d13c6ab52f3a27491037b5e # Parent 7d8d81c885c38e4a995371ebf4f2409bde511867 Fix mirror URL (it can have a traling slash or not) and fix mirror file backup (we dont have wanted.txt depends.txt libraries.txt) diff -r 7d8d81c885c3 -r 1261d89830ee AUTHORS --- a/AUTHORS Sun Apr 01 16:48:06 2012 +0100 +++ b/AUTHORS Thu Apr 05 12:43:45 2012 +0200 @@ -2,6 +2,10 @@ Pascal Bellard Eric Joseph-Alexandre Paul Issott +Claudinei Pereira Rohit Joshi Antoine Bodin Christopher Rogers +Richard Dunbar +Aleksej Bobylev + diff -r 7d8d81c885c3 -r 1261d89830ee tazpkg --- a/tazpkg Sun Apr 01 16:48:06 2012 +0100 +++ b/tazpkg Thu Apr 05 12:43:45 2012 +0200 @@ -13,13 +13,7 @@ # # (C) 2007-2012 SliTaz - GNU General Public License v3. # -# Authors : Christophe Lincoln -# Pascal Bellard -# Eric Joseph-Alexandre -# Paul Issott -# Rohit Joshi -# Antoine Bodin -# Christopher Rogers +# Authors : Seee AUTHORS files # VERSION=4.9.1 @@ -398,8 +392,9 @@ shift for i in $mirrors; do case "$i" in - http://*|ftp://*) wget -c $i/$@ && break;; - *) ln -sf $i/$1 . && break;; + # Mirror URL can have a trailing slash or not. + http://*|ftp://*) wget -c ${i%/}/$@ && break;; + *) ln -sf $i/$1 . && break;; esac done } @@ -2309,10 +2304,10 @@ if [ -f "packages.list" ]; then gettext "Creating backup of the last packages list..." - for i in wanted.txt depends.txt libraries.txt \ - packages.desc packages.md5 packages.txt \ - packages.list packages.equiv files.list.lzma \ - mirrors; do + for i in packages.desc packages.md5 packages.txt \ + packages.list packages.equiv files.list.lzma \ + mirrors + do mv -f $i $i.bak 2>/dev/null done status