tazpkg rev 580
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)
author | Christophe Lincoln <pankso@slitaz.org> |
---|---|
date | Thu Apr 05 12:43:45 2012 +0200 (2012-04-05) |
parents | 7d8d81c885c3 |
children | 33decfc12dc4 |
files | AUTHORS tazpkg |
line diff
1.1 --- a/AUTHORS Sun Apr 01 16:48:06 2012 +0100 1.2 +++ b/AUTHORS Thu Apr 05 12:43:45 2012 +0200 1.3 @@ -2,6 +2,10 @@ 1.4 Pascal Bellard <pascal.bellard@slitaz.org> 1.5 Eric Joseph-Alexandre <erjo@slitaz.org> 1.6 Paul Issott <paul@slitaz.org> 1.7 +Claudinei Pereira <claudinei@slitaz.org> 1.8 Rohit Joshi <jozee@slitaz.org> 1.9 Antoine Bodin <gokhlayeh@mailoo.org> 1.10 Christopher Rogers <slaxemulator@gmail.com> 1.11 +Richard Dunbar <mojo@slitaz.org> 1.12 +Aleksej Bobylev <al.bobylev@gmail.com> 1.13 +
2.1 --- a/tazpkg Sun Apr 01 16:48:06 2012 +0100 2.2 +++ b/tazpkg Thu Apr 05 12:43:45 2012 +0200 2.3 @@ -13,13 +13,7 @@ 2.4 # 2.5 # (C) 2007-2012 SliTaz - GNU General Public License v3. 2.6 # 2.7 -# Authors : Christophe Lincoln <pankso@slitaz.org> 2.8 -# Pascal Bellard <pascal.bellard@slitaz.org> 2.9 -# Eric Joseph-Alexandre <erjo@slitaz.org> 2.10 -# Paul Issott <paul@slitaz.org> 2.11 -# Rohit Joshi <jozee@slitaz.org> 2.12 -# Antoine Bodin <gokhlayeh@slitaz.org> 2.13 -# Christopher Rogers <slaxemulator@gmail.com> 2.14 +# Authors : Seee AUTHORS files 2.15 # 2.16 VERSION=4.9.1 2.17 2.18 @@ -398,8 +392,9 @@ 2.19 shift 2.20 for i in $mirrors; do 2.21 case "$i" in 2.22 - http://*|ftp://*) wget -c $i/$@ && break;; 2.23 - *) ln -sf $i/$1 . && break;; 2.24 + # Mirror URL can have a trailing slash or not. 2.25 + http://*|ftp://*) wget -c ${i%/}/$@ && break;; 2.26 + *) ln -sf $i/$1 . && break;; 2.27 esac 2.28 done 2.29 } 2.30 @@ -2309,10 +2304,10 @@ 2.31 2.32 if [ -f "packages.list" ]; then 2.33 gettext "Creating backup of the last packages list..." 2.34 - for i in wanted.txt depends.txt libraries.txt \ 2.35 - packages.desc packages.md5 packages.txt \ 2.36 - packages.list packages.equiv files.list.lzma \ 2.37 - mirrors; do 2.38 + for i in packages.desc packages.md5 packages.txt \ 2.39 + packages.list packages.equiv files.list.lzma \ 2.40 + mirrors 2.41 + do 2.42 mv -f $i $i.bak 2>/dev/null 2.43 done 2.44 status