tazpkg diff tazpkg @ rev 576

tazpkg: Fixed last commit.
author Christopher Rogers <slaxemulator@gmail.com>
date Sun Mar 25 15:12:59 2012 -0500 (2012-03-25)
parents a57db8ac9e3a
children 6c19eff18a07
line diff
     1.1 --- a/tazpkg	Sun Mar 25 00:30:57 2012 +0000
     1.2 +++ b/tazpkg	Sun Mar 25 15:12:59 2012 -0500
     1.3 @@ -398,7 +398,7 @@
     1.4  	shift
     1.5  	for i in $mirrors; do
     1.6  		case "$i" in
     1.7 -		http://*|ftp://*) wget -c $i$@ && break;;
     1.8 +		http://*|ftp://*) wget -c $i/$@ && break;;
     1.9  		*) ln -sf $i/$1 . && break;;
    1.10  		esac
    1.11  	done
    1.12 @@ -2299,7 +2299,7 @@
    1.13  			if [ -f ID ]; then
    1.14  				mv -f ID ID.bak
    1.15  				cat ID.bak > ID
    1.16 -                                rm ID.bak
    1.17 +				rm ID.bak
    1.18  			fi
    1.19  			
    1.20  			echo ""
    1.21 @@ -2318,19 +2318,19 @@
    1.22  				status
    1.23  			fi
    1.24  
    1.25 -                        for i in desc md5 txt list equiv; do
    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 "$(sed 's|packages/.*||' < mirror)" mirrors
    1.33 -    		        [ -f mirrors ] || mv mirrors.bak mirrors 2> /dev/null
    1.34 -         		suffix=$(head -1 mirror)
    1.35 -        		suffix=packages${suffix#*/packages}
    1.36 -        		for i in $(cat mirrors 2> /dev/null); do
    1.37 +			download_from "$(sed 's|packages/.*||' < mirror)" mirrors
    1.38 +			[ -f mirrors ] || mv mirrors.bak mirrors 2> /dev/null
    1.39 +         	suffix=$(head -1 mirror)
    1.40 +        	suffix=packages${suffix#*/packages}
    1.41 +        	for i in $(cat mirrors 2> /dev/null); do
    1.42          		fgrep -qs $i mirror || echo $i$suffix >> mirror
    1.43 -        		done
    1.44 +        	done
    1.45  			if [ -f "packages.list.bak" ]; then
    1.46  				diff -u packages.list.bak packages.list | grep ^+[a-z] > packages.diff
    1.47  				sed -i s/+// packages.diff