cookutils diff modules/compressor @ rev 912

cook: remake copy_generic_files()/copy_generic_stuff() logic; change build dep installation (AUTO_COOK isn't work now) with tazpkg cookmode; improve mk_pkg_receipt(), copy(); update 'cook package --pack'; add docs about copy(); lighttpd/index.cgi: summary on unpackaged files; tiny edits on lighttpd/cooker.css and modules/compressor.
author Aleksej Bobylev <al.bobylev@gmail.com>
date Mon Jun 05 15:59:11 2017 +0300 (2017-06-05)
parents 39feb4e7243d
children 5f884df71b44
line diff
     1.1 --- a/modules/compressor	Tue May 30 12:08:36 2017 +0300
     1.2 +++ b/modules/compressor	Mon Jun 05 15:59:11 2017 +0300
     1.3 @@ -6,10 +6,6 @@
     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  comp_cache_root='/home/slitaz/cache/cook'
    1.14 @@ -30,6 +26,13 @@
    1.15  #
    1.16  
    1.17  
    1.18 +# tazpkg install command
    1.19 +
    1.20 +tpi() {
    1.21 +	tazpkg -gi --quiet --local --cookmode $1
    1.22 +}
    1.23 +
    1.24 +
    1.25  # Working with time (with hundredths precision)
    1.26  
    1.27  get_time() {
    1.28 @@ -123,7 +126,7 @@
    1.29  	[ -d "$manpath" ] || return
    1.30  	size0=$(sizes man); [ -z "$size0" ] && return
    1.31  
    1.32 -	$tpi advancecomp
    1.33 +	tpi advancecomp
    1.34  
    1.35  	action 'Compressing man pages...'
    1.36  
    1.37 @@ -162,7 +165,7 @@
    1.38  	[ "${COOKOPTS/!gz/}" != "$COOKOPTS" ] && return
    1.39  	size0=$(sizes gz); [ -z "$size0" ] && return
    1.40  
    1.41 -	$tpi advancecomp
    1.42 +	tpi advancecomp
    1.43  
    1.44  	action 'Recompressing gzip files...'
    1.45  
    1.46 @@ -191,8 +194,8 @@
    1.47  	use_op=true
    1.48  	[ "${COOKOPTS/!pngquant/}" != "$COOKOPTS" ] && use_pq=false
    1.49  	[ "${COOKOPTS/!optipng/}"  != "$COOKOPTS" ] && use_op=false
    1.50 -	$use_pq && $tpi pngquant
    1.51 -	$use_op && $tpi optipng
    1.52 +	$use_pq && tpi pngquant
    1.53 +	$use_op && tpi optipng
    1.54  
    1.55  	action 'Compressing png images...'
    1.56  
    1.57 @@ -226,7 +229,7 @@
    1.58  	[ "${COOKOPTS/!svgz/}" != "$COOKOPTS" ] && return
    1.59  	size0=$(sizes svg); [ -z "$size0" ] && return
    1.60  
    1.61 -	$tpi svgcleaner
    1.62 +	tpi svgcleaner
    1.63  
    1.64  	action 'Compressing svg images...'
    1.65  
    1.66 @@ -257,7 +260,7 @@
    1.67  	[ "${COOKOPTS/!uiz/}" != "$COOKOPTS" ] && return
    1.68  	[ -z "$(find $install -type f \( -name '*.ui' -o -name '*.glade' \) )" ] && return
    1.69  
    1.70 -	$tpi xmlstarlet
    1.71 +	tpi xmlstarlet
    1.72  
    1.73  	action 'Compressing ui files...'
    1.74  
    1.75 @@ -312,7 +315,7 @@
    1.76  	time0=$(get_time)
    1.77  
    1.78  	if [ -n "$QA" -a -z "$(which desktop-file-validate)" ]; then
    1.79 -		$tpi desktop-file-utils-extra
    1.80 +		tpi desktop-file-utils-extra
    1.81  	fi
    1.82  
    1.83  	# The variable $LOCALE is set in cook.conf and may be overridden in the receipt.
    1.84 @@ -362,9 +365,9 @@
    1.85  	[ -z "$(find $install -type f -name '*.mo')" ] && return
    1.86  
    1.87  	# Gettext functions: msgunfmt, msguniq, msgconv, msgfmt
    1.88 -	$tpi gettext
    1.89 +	tpi gettext
    1.90  	# Gconv modules (convert to UTF-8)
    1.91 -	$tpi glibc-locale
    1.92 +	tpi glibc-locale
    1.93  
    1.94  	action 'Normalizing mo files...'
    1.95