cookutils rev 818

cook: disable compress_manpages() and cook_compress_png() for arm arch;
cook_copy_icons(): optional size and check
author Aleksej Bobylev <al.bobylev@gmail.com>
date Tue Jul 12 03:02:02 2016 +0300 (2016-07-12)
parents 0fcf24dbe68e
children 3ecb0788b8eb
files cook
line diff
     1.1 --- a/cook	Sun Jul 10 21:35:08 2016 +0300
     1.2 +++ b/cook	Tue Jul 12 03:02:02 2016 +0300
     1.3 @@ -571,10 +571,14 @@
     1.4  # Function to compress all man pages
     1.5  
     1.6  compress_manpages() {
     1.7 +	case "$ARCH" in
     1.8 +		arm*) return;; # While SliTaz-arm miss `advancecomp`
     1.9 +	esac
    1.10  	# Don't compress man pages for splitted packages
    1.11  	[ -n "$WANTED" ] && return
    1.12  	local manpath="$install/usr/share/man" dest link
    1.13  	[ -d "$manpath" ] || return
    1.14 +
    1.15  	action 'Compressing man pages...'
    1.16  
    1.17  	# We'll use only Gzip compression, so decompress other formats first
    1.18 @@ -1232,6 +1236,10 @@
    1.19  # Function to use in compile_rules() to compress all png images
    1.20  
    1.21  cook_compress_png() {
    1.22 +	case "$ARCH" in
    1.23 +		arm*) return;; # While SliTaz-arm miss `pngquant` and `optipng`
    1.24 +	esac
    1.25 +
    1.26  	action 'Compressing png images...'
    1.27  	local size0=$(find $install -type f -name '*.png' -exec ls -l \{\} \; | awk '{s+=$5}END{print s}')
    1.28  	tazpkg -gi pngquant --quiet
    1.29 @@ -1263,13 +1271,17 @@
    1.30  }
    1.31  
    1.32  
    1.33 -# Function to use in genpkg_rules() to copy hicolor icons in sizes 16 and 48 from $install to $fs
    1.34 +# Function to use in genpkg_rules() to copy hicolor icons in specified sizes
    1.35 +# (default: 16 and 48) from $install to $fs
    1.36  
    1.37  cook_copy_icons() {
    1.38 +	local sizes=$@
    1.39  	action 'Copying hicolor icons...'
    1.40  	mkdir -p $fs/usr/share/icons/hicolor
    1.41 -	for i in 16x16 48x48; do
    1.42 -		cp -a $install/usr/share/icons/hicolor/$i $fs/usr/share/icons/hicolor
    1.43 +	for i in ${sizes:-16 48}; do
    1.44 +		[ -e "$install/usr/share/icons/hicolor/${i}x$i" ] &&
    1.45 +		cp -a $install/usr/share/icons/hicolor/${i}x$i \
    1.46 +			$fs/usr/share/icons/hicolor
    1.47  	done
    1.48  	status
    1.49  }