tazpkg diff modules/get @ rev 855

cache: fix working; install: install official conf.files if destination is absent; tazpkg-notify: change icons
author Aleksej Bobylev <al.bobylev@gmail.com>
date Mon Nov 09 04:54:02 2015 +0200 (2015-11-09)
parents ce7009ff237b
children 8c6346ff1cef
line diff
     1.1 --- a/modules/get	Tue Oct 06 15:46:41 2015 +0300
     1.2 +++ b/modules/get	Mon Nov 09 04:54:02 2015 +0200
     1.3 @@ -93,9 +93,9 @@
     1.4  	case "$1" in
     1.5  		# Mirror URL can have a trailing slash or not.
     1.6  		http://* | https://* | ftp://*)
     1.7 -			debug "  busybox wget -c -q -T 30 -U $UA ${1%/}/$2"
     1.8 +			debug "  wget -c -q -T 30 -U $UA ${1%/}/$2"
     1.9  			# TODO: display abridged wget status
    1.10 -			busybox wget -c -q -T 30 -U $UA ${1%/}/$2
    1.11 +			wget -c -q -T 30 -U $UA ${1%/}/$2
    1.12  			;;
    1.13  		*)
    1.14  			debug "  ln -sf ${1%/}/$2 ."
    1.15 @@ -173,7 +173,7 @@
    1.16  
    1.17  	# Try converted extra-packages first
    1.18  	# FIXME: Workaround to get packages filenames (even better to have names and versions separate)
    1.19 -	converted="$(busybox wget -O - http://mirror1.slitaz.org/packages/extra/ 2>/dev/null | \
    1.20 +	converted="$(wget -O - http://mirror1.slitaz.org/packages/extra/ 2>/dev/null | \
    1.21  		tr \'\" $'\n' | grep "$1-.*\.tazpkg$" | sort -u)"
    1.22  	debug "converted='$converted'"
    1.23  	if [ -n "$converted" ]; then
    1.24 @@ -181,8 +181,8 @@
    1.25  			http://*|https://*|ftp://*)
    1.26  				# Default 'http://mirror.slitaz.org/packages/cooking/'
    1.27  				#      -> 'http://mirror.slitaz.org/packages/extra/'
    1.28 -				debug "busybox wget -q -T 30 -U '$UA' '${mirror%packages/*}packages/extra/$converted'"
    1.29 -				busybox wget -q -T 30 -U "$UA" "${mirror%packages/*}packages/extra/$converted";;
    1.30 +				debug "wget -q -T 30 -U '$UA' '${mirror%packages/*}packages/extra/$converted'"
    1.31 +				wget -q -T 30 -U "$UA" "${mirror%packages/*}packages/extra/$converted";;
    1.32  		esac
    1.33  		if [ -f "$converted" ]; then
    1.34  			echo "$extra_cache/$converted"; exit 0
    1.35 @@ -196,8 +196,8 @@
    1.36  		http://*|https://*|ftp://*)
    1.37  			# Default 'http://mirror.slitaz.org/packages/cooking/'
    1.38  			#      -> 'http://mirror.slitaz.org/packages/get/'
    1.39 -			debug "busybox wget -q -T 30 -U '$UA' '${mirror%packages/*}packages/get/$1'"
    1.40 -			busybox wget -q -T 30 -U "$UA" "${mirror%packages/*}packages/get/$1";;
    1.41 +			debug "wget -q -T 30 -U '$UA' '${mirror%packages/*}packages/get/$1'"
    1.42 +			wget -q -T 30 -U "$UA" "${mirror%packages/*}packages/get/$1";;
    1.43  	esac
    1.44  
    1.45  	if [ ! -f "$1" ]; then