tazpkg rev 581

Remove buggy and unneede code about mirror file, mirror MUST have only one main mirror URL (use setup-mirror to change the url)
author Christophe Lincoln <pankso@slitaz.org>
date Thu Apr 05 13:20:50 2012 +0200 (2012-04-05)
parents 1261d89830ee
children 3167d47c97c5
files tazpkg
line diff
     1.1 --- a/tazpkg	Thu Apr 05 12:43:45 2012 +0200
     1.2 +++ b/tazpkg	Thu Apr 05 13:20:50 2012 +0200
     1.3 @@ -393,8 +393,8 @@
     1.4  	for i in $mirrors; do
     1.5  		case "$i" in
     1.6  			# Mirror URL can have a trailing slash or not.
     1.7 -			http://*|ftp://*) wget -c ${i%/}/$@ && break;;
     1.8 -			*) ln -sf $i/$1 . && break;;
     1.9 +			http://*|ftp://*) wget -c ${i%/}/$@ && break ;;
    1.10 +			*) ln -sf $i/$1 . && break ;;
    1.11  		esac
    1.12  	done
    1.13  }
    1.14 @@ -2252,6 +2252,10 @@
    1.15  		fi ;;
    1.16  	recharge)
    1.17  		# Recharge packages.list from a mirror.
    1.18 +		#
    1.19 +		# WARRNING: The mirrors file have all SliTaz mirrors but mirror
    1.20 +		# must have only the choosen main mirror.
    1.21 +		#
    1.22  		check_root
    1.23  		get_options_list="root forced list rootconfig"
    1.24  		get_options
    1.25 @@ -2316,16 +2320,9 @@
    1.26  			for i in desc md5 txt list equiv; do
    1.27  				download_from "$(cat mirror)" packages.$i
    1.28  			done
    1.29 -
    1.30 -			download_from "$(cat mirror)" files.list.lzma
    1.31 -                                 
    1.32 +			download_from "$(cat mirror)" files.list.lzma             
    1.33  			download_from "$(sed 's|packages/.*||' < mirror)" mirrors
    1.34 -			[ -f mirrors ] || mv mirrors.bak mirrors 2> /dev/null
    1.35 -         	suffix=$(head -1 mirror)
    1.36 -        	suffix=packages${suffix#*/packages}
    1.37 -        	for i in $(cat mirrors 2> /dev/null); do
    1.38 -        		fgrep -qs $i mirror || echo $i$suffix >> mirror
    1.39 -        	done
    1.40 +			
    1.41  			if [ -f "packages.list.bak" ]; then
    1.42  				diff -u packages.list.bak packages.list | grep ^+[a-z] > packages.diff
    1.43  				sed -i s/+// packages.diff