tazpkg diff 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 6c19eff18a07
children 33decfc12dc4
line diff
     1.1 --- a/tazpkg	Thu Mar 29 08:56:51 2012 +0200
     1.2 +++ b/tazpkg	Thu Apr 05 12:43:45 2012 +0200
     1.3 @@ -13,13 +13,7 @@
     1.4  #
     1.5  # (C) 2007-2012 SliTaz - GNU General Public License v3.
     1.6  #
     1.7 -# Authors : Christophe Lincoln <pankso@slitaz.org>
     1.8 -#           Pascal Bellard <pascal.bellard@slitaz.org>
     1.9 -#           Eric Joseph-Alexandre <erjo@slitaz.org>
    1.10 -#           Paul Issott <paul@slitaz.org>
    1.11 -#           Rohit Joshi <jozee@slitaz.org>
    1.12 -#           Antoine Bodin <gokhlayeh@slitaz.org>
    1.13 -#           Christopher Rogers <slaxemulator@gmail.com>
    1.14 +# Authors : Seee AUTHORS files
    1.15  #
    1.16  VERSION=4.9.1
    1.17  
    1.18 @@ -398,8 +392,9 @@
    1.19  	shift
    1.20  	for i in $mirrors; do
    1.21  		case "$i" in
    1.22 -		http://*|ftp://*) wget -c $i/$@ && break;;
    1.23 -		*) ln -sf $i/$1 . && break;;
    1.24 +			# Mirror URL can have a trailing slash or not.
    1.25 +			http://*|ftp://*) wget -c ${i%/}/$@ && break;;
    1.26 +			*) ln -sf $i/$1 . && break;;
    1.27  		esac
    1.28  	done
    1.29  }
    1.30 @@ -2309,10 +2304,10 @@
    1.31  
    1.32  			if [ -f "packages.list" ]; then
    1.33  				gettext "Creating backup of the last packages list..."
    1.34 -				for i in  wanted.txt depends.txt libraries.txt \
    1.35 -				packages.desc packages.md5 packages.txt \
    1.36 -				packages.list packages.equiv files.list.lzma \
    1.37 -				mirrors; do
    1.38 +				for i in packages.desc packages.md5 packages.txt \
    1.39 +					packages.list packages.equiv files.list.lzma \
    1.40 +					mirrors
    1.41 +				do
    1.42  					mv -f $i $i.bak 2>/dev/null
    1.43  				done
    1.44  				status