cookutils rev 841

cook: 1) set_paths(): follow receipt possible changes (allow auto-updating); 2) strip_mo_i18n(): search for *.mo files only in /usr/share/locale (fix gambas2 cooking)
author Aleksej Bobylev <al.bobylev@gmail.com>
date Tue Nov 29 15:53:17 2016 +0200 (2016-11-29)
parents 9dc64af5ba9c
children 7c61b5215cab
files cook
line diff
     1.1 --- a/cook	Sat Nov 19 22:48:02 2016 +0200
     1.2 +++ b/cook	Tue Nov 29 15:53:17 2016 +0200
     1.3 @@ -153,6 +153,7 @@
     1.4  
     1.5  set_paths() {
     1.6  	pkgdir="$WOK/$PACKAGE"
     1.7 +	. "$pkgdir/receipt"
     1.8  	basesrc="$pkgdir/source"
     1.9  	tmpsrc="$basesrc/tmp"
    1.10  	src="$basesrc/$PACKAGE-$VERSION"
    1.11 @@ -369,6 +370,7 @@
    1.12  # Display cooked package summary.
    1.13  
    1.14  summary() {
    1.15 +	set_paths
    1.16  	cd $WOK/$pkg
    1.17  	[ -d $WOK/$pkg/install ] && prod=$(du -sh $WOK/$pkg/install | awk '{print $1}' 2>/dev/null)
    1.18  	[ -d $WOK/$pkg/source ] && srcdir=$(du -sh $WOK/$pkg/source | awk '{print $1}' 2>/dev/null)
    1.19 @@ -624,10 +626,11 @@
    1.20  strip_mo_i18n() {
    1.21  	[ "${COOKOPTS/!i18nz/}" != "$COOKOPTS" ] && return
    1.22  
    1.23 -	[ -z "$(find $fs -type f -name '*.mo')" ] && return
    1.24 +	[ -d "$fs/usr/share/locale" ] || return
    1.25 +	[ -z "$(find $fs/usr/share/locale -type f -name '*.mo')" ] && return
    1.26  
    1.27  	action 'Stripping translations files...'
    1.28 -	local size0=$(find $fs -type f -name '*.mo' -exec ls -l \{\} \; | awk '{s+=$5}END{print s}')
    1.29 +	local size0=$(find $fs$fs/usr/share/locale -type f -name '*.mo' -exec ls -l \{\} \; | awk '{s+=$5}END{print s}')
    1.30  	local time0=$(date +%s)
    1.31  
    1.32  	# The variable $LOCALE is set in cook.conf and may be overridden in the receipt.