cookutils diff cook @ rev 951

Minor bug fixes due to the change in the behavior of the dot command in Busybox-1.27.
author Aleksej Bobylev <al.bobylev@gmail.com>
date Thu Jul 27 13:36:30 2017 +0300 (2017-07-27)
parents db84a0fdf6f4
children c17ee46f8a4e
line diff
     1.1 --- a/cook	Sun Jul 23 12:35:12 2017 +0200
     1.2 +++ b/cook	Thu Jul 27 13:36:30 2017 +0300
     1.3 @@ -981,7 +981,7 @@
     1.4  	# Create files.list with redirecting find output.
     1.5  	action 'Creating the list of files...'
     1.6  	cd $fs
     1.7 -	find . -type f -print > ../files.list
     1.8 +	find . -type f -print >  ../files.list
     1.9  	find . -type l -print >> ../files.list
    1.10  	cd ..; sed -i 's|^.||' files.list
    1.11  	status
    1.12 @@ -1557,7 +1557,7 @@
    1.13  			for pkg in $(fgrep 'HOST_ARCH=' */receipt | egrep "$ARCH|any" | cut -d: -f1)
    1.14  			do
    1.15  				unset HOST_ARCH
    1.16 -				. $pkg
    1.17 +				. ./$pkg
    1.18  				count=$(($count + 1))
    1.19  				colorize 34 "$PACKAGE"
    1.20  			done
    1.21 @@ -1795,13 +1795,13 @@
    1.22  		count=0
    1.23  		title 'Checking for uncooked packages'
    1.24  
    1.25 -		for pkg in *; do
    1.26 +		for i in *; do
    1.27  			unset HOST_ARCH EXTRAVERSION
    1.28 -			[ ! -e $pkg/receipt ] && continue
    1.29 -			. $pkg/receipt
    1.30 +			[ ! -e $i/receipt ] && continue
    1.31 +			. ./$i/receipt
    1.32  			# Source cooked pkg receipt to get EXTRAVERSION
    1.33 -			if [ -d "$WOK/$pkg/taz" ]; then
    1.34 -				cd $WOK/$pkg/taz/$pkg-*
    1.35 +			if [ -d "$WOK/$i/taz" ]; then
    1.36 +				cd $WOK/$i/taz/$(ls $WOK/$i/taz/ | head -n1)
    1.37  				. ./receipt; cd $WOK
    1.38  			fi 
    1.39  			case "$ARCH" in
    1.40 @@ -1809,7 +1809,7 @@
    1.41  					debug "$(_ 'Package "%s"' "$PKGS/$PACKAGE-$VERSION$EXTRAVERSION.tazpkg")"
    1.42  					if [ ! -f "$PKGS/$PACKAGE-$VERSION$EXTRAVERSION.tazpkg" ]; then
    1.43  						count=$(($count + 1))
    1.44 -						colorize 34 "$pkg"
    1.45 +						colorize 34 "$i"
    1.46  					fi ;;
    1.47  				arm*)
    1.48  					# Check only packages included in arch
    1.49 @@ -1817,7 +1817,7 @@
    1.50  						# *.tazpkg
    1.51  						if [ ! -f "$PKGS/$PACKAGE-$VERSION$EXTRAVERSION-$ARCH.tazpkg" ]; then
    1.52  							count=$(($count + 1))
    1.53 -							colorize 34 "$pkg"
    1.54 +							colorize 34 "$i"
    1.55  						fi
    1.56  					fi ;;
    1.57  			esac