tazpkg rev 877

module get: hide wget status in --quiet mode
author Aleksej Bobylev <al.bobylev@gmail.com>
date Mon Nov 30 02:18:50 2015 +0200 (2015-11-30)
parents 19fad7781af3
children 97454e15c034
files modules/get
line diff
     1.1 --- a/modules/get	Mon Nov 30 01:45:37 2015 +0200
     1.2 +++ b/modules/get	Mon Nov 30 02:18:50 2015 +0200
     1.3 @@ -94,8 +94,9 @@
     1.4  		# Mirror URL can have a trailing slash or not.
     1.5  		http://* | https://* | ftp://*)
     1.6  			debug "  wget -c -T 30 -U $UA ${1%/}/$2"
     1.7 +			q=''; [ -n "$quiet" ] && q='-q'
     1.8  			# Display abridged wget status (skip info about connections)
     1.9 -			wget -c -T 30 -U $UA ${1%/}/$2 2>&1 | awk 'BEGIN{RS="\r"}$0~"%"{printf "%s\r",$0}' >&2
    1.10 +			wget -c $q -T 30 -U $UA ${1%/}/$2 2>&1 | awk 'BEGIN{RS="\r"}$0~"%"{printf "%s\r",$0}' >&2
    1.11  			;;
    1.12  		*)
    1.13  			debug "  cp ${1%/}/$2 ."
    1.14 @@ -182,7 +183,8 @@
    1.15  				# Default 'http://mirror.slitaz.org/packages/cooking/'
    1.16  				#      -> 'http://mirror.slitaz.org/packages/extra/'
    1.17  				debug "wget -T 30 -U '$UA' '${mirror%packages/*}packages/extra/$converted'"
    1.18 -				wget -T 30 -U "$UA" "${mirror%packages/*}packages/extra/$converted" \
    1.19 +				q=''; [ -n "$quiet" ] && q='-q'
    1.20 +				wget $q -T 30 -U "$UA" "${mirror%packages/*}packages/extra/$converted" \
    1.21  					2>&1 | awk 'BEGIN{RS="\r"}$0~"%"{printf "%s\r",$0}' >&2;;
    1.22  		esac
    1.23  		if [ -f "$converted" ]; then
    1.24 @@ -198,7 +200,8 @@
    1.25  			# Default 'http://mirror.slitaz.org/packages/cooking/'
    1.26  			#      -> 'http://mirror.slitaz.org/packages/get/'
    1.27  			debug "wget -T 30 -U '$UA' '${mirror%packages/*}packages/get/$1'"
    1.28 -			wget -T 30 -U "$UA" "${mirror%packages/*}packages/get/$1" \
    1.29 +			q=''; [ -n "$quiet" ] && q='-q'
    1.30 +			wget $q -T 30 -U "$UA" "${mirror%packages/*}packages/get/$1" \
    1.31  				2>&1 | awk 'BEGIN{RS="\r"}$0~"%"{printf "%s\r",$0}' >&2;;
    1.32  	esac
    1.33