SliTaz Repositories

     1.1 --- a/modules/compressor	Tue May 30 05:33:45 2017 +0300
     1.2 +++ b/modules/compressor	Tue May 30 12:08:36 2017 +0300
     1.3 @@ -6,6 +6,9 @@
     1.4  
     1.5  . /usr/lib/slitaz/libcook.sh
     1.6  
     1.7 +# tazpkg install command
     1.8 +tpi='tazpkg -gi --quiet --local --cookmode'
     1.9 +
    1.10  
    1.11  # Compressor cache stuff
    1.12  
    1.13 @@ -120,7 +123,7 @@
    1.14  	[ -d "$manpath" ] || return
    1.15  	size0=$(sizes man); [ -z "$size0" ] && return
    1.16  
    1.17 -	tazpkg -gi advancecomp --quiet --cookmode
    1.18 +	$tpi advancecomp
    1.19  
    1.20  	action 'Compressing man pages...'
    1.21  
    1.22 @@ -159,7 +162,7 @@
    1.23  	[ "${COOKOPTS/!gz/}" != "$COOKOPTS" ] && return
    1.24  	size0=$(sizes gz); [ -z "$size0" ] && return
    1.25  
    1.26 -	tazpkg -gi advancecomp --quiet --cookmode
    1.27 +	$tpi advancecomp
    1.28  
    1.29  	action 'Recompressing gzip files...'
    1.30  
    1.31 @@ -188,8 +191,8 @@
    1.32  	use_op=true
    1.33  	[ "${COOKOPTS/!pngquant/}" != "$COOKOPTS" ] && use_pq=false
    1.34  	[ "${COOKOPTS/!optipng/}"  != "$COOKOPTS" ] && use_op=false
    1.35 -	$use_pq && tazpkg -gi pngquant --quiet --cookmode
    1.36 -	$use_op && tazpkg -gi optipng  --quiet --cookmode
    1.37 +	$use_pq && $tpi pngquant
    1.38 +	$use_op && $tpi optipng
    1.39  
    1.40  	action 'Compressing png images...'
    1.41  
    1.42 @@ -223,7 +226,7 @@
    1.43  	[ "${COOKOPTS/!svgz/}" != "$COOKOPTS" ] && return
    1.44  	size0=$(sizes svg); [ -z "$size0" ] && return
    1.45  
    1.46 -	tazpkg -gi svgcleaner --quiet --cookmode
    1.47 +	$tpi svgcleaner
    1.48  
    1.49  	action 'Compressing svg images...'
    1.50  
    1.51 @@ -254,7 +257,7 @@
    1.52  	[ "${COOKOPTS/!uiz/}" != "$COOKOPTS" ] && return
    1.53  	[ -z "$(find $install -type f \( -name '*.ui' -o -name '*.glade' \) )" ] && return
    1.54  
    1.55 -	tazpkg -gi xmlstarlet --quiet --cookmode
    1.56 +	$tpi xmlstarlet
    1.57  
    1.58  	action 'Compressing ui files...'
    1.59  
    1.60 @@ -309,7 +312,7 @@
    1.61  	time0=$(get_time)
    1.62  
    1.63  	if [ -n "$QA" -a -z "$(which desktop-file-validate)" ]; then
    1.64 -		tazpkg -gi desktop-file-utils-extra --quiet --cookmode
    1.65 +		$tpi desktop-file-utils-extra
    1.66  	fi
    1.67  
    1.68  	# The variable $LOCALE is set in cook.conf and may be overridden in the receipt.
    1.69 @@ -359,9 +362,9 @@
    1.70  	[ -z "$(find $install -type f -name '*.mo')" ] && return
    1.71  
    1.72  	# Gettext functions: msgunfmt, msguniq, msgconv, msgfmt
    1.73 -	tazpkg -gi gettext      --quiet --cookmode
    1.74 +	$tpi gettext
    1.75  	# Gconv modules (convert to UTF-8)
    1.76 -	tazpkg -gi glibc-locale --quiet --cookmode
    1.77 +	$tpi glibc-locale
    1.78  
    1.79  	action 'Normalizing mo files...'
    1.80