cookutils rev 854

Tiny edits
author Paul Issott <paul@slitaz.org>
date Wed Dec 21 17:36:29 2016 +0000 (2016-12-21)
parents 1e6f118c40b2
children dc1cae3fcda4
files cook cooks
line diff
     1.1 --- a/cook	Tue Dec 20 12:55:39 2016 +0100
     1.2 +++ b/cook	Wed Dec 21 17:36:29 2016 +0000
     1.3 @@ -642,7 +642,7 @@
     1.4  	elocales=" $(ls -1 "$fs/usr/share/locale" | tr '\n' ' ') "
     1.5  
     1.6  	# Thin out the list of existing locales. At the end there will be only locales that need
     1.7 -	# to delete (and the garbage like '_AU', _US', '_BR' leaving from 'en_AU', 'en_US', 'pt_BR'...)
     1.8 +	# deleting (and the garbage like '_AU', _US', '_BR' leaving from 'en_AU', 'en_US', 'pt_BR'...)
     1.9  	for keep_locale in $LOCALE; do
    1.10  		elocales=${elocales//$keep_locale}
    1.11  	done
    1.12 @@ -790,7 +790,7 @@
    1.13  }
    1.14  
    1.15  
    1.16 -# Remove files provided by splitted packages
    1.17 +# Remove files provided by split packages
    1.18  # For example:
    1.19  #   1. Package "pkg-main":
    1.20  #      SPLIT="pkg-1 pkg-2 pkg-extra"
    1.21 @@ -802,7 +802,7 @@
    1.22  
    1.23  cook_split_rm() {
    1.24  	for i in $@; do
    1.25 -		action 'Remove files provided by splitted package %s...' "$i"
    1.26 +		action 'Remove files provided by split package %s...' "$i"
    1.27  		while read j; do
    1.28  			[ -f "$fs$j" -o -h "$fs$j" ] && rm $fs$j
    1.29  			rmdir "$(dirname "$fs$j")" 2>/dev/null
    1.30 @@ -1201,7 +1201,7 @@
    1.31  	fi
    1.32  
    1.33  	# Actions to do after compiling the package
    1.34 -	# Skip all for splitted packages (already done in main package)
    1.35 +	# Skip all for split packages (already done in main package)
    1.36  	if [ -z "$WANTED" ]; then
    1.37  		footer
    1.38  		compress_manpages
     2.1 --- a/cooks	Tue Dec 20 12:55:39 2016 +0100
     2.2 +++ b/cooks	Wed Dec 21 17:36:29 2016 +0000
     2.3 @@ -1,6 +1,6 @@
     2.4  #!/bin/sh
     2.5 -# Cook specified package and then cook all the splitted packages
     2.6 -# that builds from the files of just builded package
     2.7 +# Cook specified package and then cook all the split packages
     2.8 +# that build from the files of just built packages
     2.9  
    2.10  case "$1" in
    2.11  	--help|-h)
    2.12 @@ -25,10 +25,10 @@
    2.13  splitted=$(SPLIT=''; . $WOK/$pkg/receipt; echo $SPLIT)
    2.14  
    2.15  # $SPLIT may contain the "*-dev" somewhere already if cooking order is significant.
    2.16 -# Cook the "*-dev" first if order is unsignificant.
    2.17 +# Cook the "*-dev" first if order is insignificant.
    2.18  [ "${splitted/$pkg-dev/}" == "$splitted" ] && splitted="$pkg-dev $splitted"
    2.19  
    2.20 -# (re-)cook all existed packages
    2.21 +# (re-)cook all existing packages
    2.22  for i in $splitted; do
    2.23  	[ -d "$WOK/$i" ] && cook $i
    2.24  done