cookutils rev 837

cook: few tweaks
author Aleksej Bobylev <al.bobylev@gmail.com>
date Tue Nov 15 03:40:41 2016 +0200 (2016-11-15)
parents 11a3c021e563
children d8bac8bb4eab
files cook
line diff
     1.1 --- a/cook	Mon Nov 14 16:58:35 2016 +0200
     1.2 +++ b/cook	Tue Nov 15 03:40:41 2016 +0200
     1.3 @@ -519,6 +519,7 @@
     1.4  # Compressor mini summary
     1.5  
     1.6  comp_summary() {
     1.7 +	[ "$3" -eq 0 ] && return
     1.8  	local time=$(($2 - $1))
     1.9  	local saving=$(( ($3 - $4) / 1024 ))
    1.10  	_ '  Time: %s. Size: %s B -> %s B. Save: %s KB' "$(disp_time $time)" "$3" "$4" "$saving"
    1.11 @@ -617,8 +618,6 @@
    1.12  	case "$ARCH" in
    1.13  		arm*) return;; # While SliTaz-arm miss `advancecomp`
    1.14  	esac
    1.15 -	# Don't compress man pages for splitted packages
    1.16 -	[ -n "$WANTED" ] && return
    1.17  	local manpath="$install/usr/share/man" dest link
    1.18  	[ -d "$manpath" ] || return
    1.19  
    1.20 @@ -965,11 +964,15 @@
    1.21  	fi
    1.22  
    1.23  	# Actions to do after compiling the package
    1.24 -	footer
    1.25 -	compress_manpages
    1.26 -	cook_compress_png
    1.27 -	cook_compress_svg
    1.28 -	compress_ui
    1.29 +	# Skip all for splitted packages (already done in main package)
    1.30 +	if [ -z "$WANTED" ]; then
    1.31 +		footer
    1.32 +		compress_manpages
    1.33 +		cook_compress_png
    1.34 +		cook_compress_svg
    1.35 +		compress_ui
    1.36 +		fix_desktop_files
    1.37 +	fi
    1.38  	footer
    1.39  
    1.40  	# Execute testsuite.
    1.41 @@ -979,8 +982,6 @@
    1.42  		footer
    1.43  	fi
    1.44  
    1.45 -	fix_desktop_files
    1.46 -
    1.47  	update_installed_cook_diff force
    1.48  }
    1.49  
    1.50 @@ -2124,11 +2125,10 @@
    1.51  		# Rotate log
    1.52  		for i in $(seq 9 -1 1); do
    1.53  			j=$(($i - 1))
    1.54 -			[ -e $LOGS/$pkg.log.$j ] &&
    1.55 -			mv -f $LOGS/$pkg.log.$j $LOGS/$pkg.log.$i
    1.56 +			[ -e $LOGS/$pkg.log.$j ] && mv -f $LOGS/$pkg.log.$j $LOGS/$pkg.log.$i
    1.57  		done
    1.58 -		mv $LOGS/$pkg.log $LOGS/$pkg.log.0
    1.59 -		
    1.60 +		[ -e $LOGS/$pkg.log ] && mv $LOGS/$pkg.log $LOGS/$pkg.log.0
    1.61 +
    1.62  		# Check if wanted is built now so we have separate log files.
    1.63  		for wanted in $WANTED ; do
    1.64  			if grep -q "^$wanted$" $blocked; then