cookutils diff cook @ rev 908

cook: support per-package CONFIG_FILES, fix pre_install etc. extracting; lighttpd/index.cgi: display all descriptions.
author Aleksej Bobylev <al.bobylev@gmail.com>
date Mon May 29 04:48:50 2017 +0300 (2017-05-29)
parents ae08a6458965
children e68dad1ffbff
line diff
     1.1 --- a/cook	Mon May 29 01:54:22 2017 +0300
     1.2 +++ b/cook	Mon May 29 04:48:50 2017 +0300
     1.3 @@ -859,6 +859,7 @@
     1.4  	[ -n "$TAGS" ]    && echo "TAGS=\"$TAGS\""
     1.5  	[ -n "$DEPENDS" ] && echo "DEPENDS=\"$DEPENDS\"" | tr -ds '\t' ' '
     1.6  	[ -n "$PROVIDE" ] && echo "PROVIDE=\"$PROVIDE\""
     1.7 +	[ -n "$CONFIG_FILES" ] && echo "CONFIG_FILES=\"$CONFIG_FILES\""
     1.8  
     1.9  	# Extract {pre,post}_{install,remove} functions;
    1.10  	# post_install_gtk_() will be copied as post_install() for gtk+ package
    1.11 @@ -869,7 +870,7 @@
    1.12  		for j in install remove; do
    1.13  			if grep -q "^${i}_${j}_$rname()" "$orig_receipt"; then
    1.14  				echo
    1.15 -				sed "/^${i}_${j}_$rname()/,/}/!d" "$orig_receipt" | \
    1.16 +				sed "/^${i}_${j}_$rname()/,/^}/!d" "$orig_receipt" | \
    1.17  				sed "s|^${i}_${j}_$rname()|${i}_${j}()|"
    1.18  			fi
    1.19  		done
    1.20 @@ -1030,7 +1031,7 @@
    1.21  	:; status
    1.22  	# Find and remove old package(s)
    1.23  	tempd="$(mktemp -d)"; cd "$tempd"
    1.24 -	for testpkg in $(ls $PKGS/$PACKAGE-*.tazpkg 2> /dev/null); do
    1.25 +	for testpkg in $(ls $PKGS/$PACKAGE-*.tazpkg 2>/dev/null); do
    1.26  		# Extract receipt from each matched package
    1.27  		cpio -F "$testpkg" -i receipt >/dev/null 2>&1
    1.28  		name=$(. receipt; echo $PACKAGE)
    1.29 @@ -1055,7 +1056,7 @@
    1.30  	set_paths
    1.31  	if head -n1 "$pkgdir/receipt" | fgrep -q 'v2'; then
    1.32  		for i in $PACKAGE $SPLIT; do
    1.33 -			unset DEPENDS CAT
    1.34 +			unset DEPENDS CAT CONFIG_FILES
    1.35  			packit $i
    1.36  		done
    1.37  	else