cookutils diff cook @ rev 211

cook: tiny edits
author Paul Issott <paul@slitaz.org>
date Sun May 22 16:39:19 2011 +0100 (2011-05-22)
parents 57cda25558f7
children 57553966e2fb
line diff
     1.1 --- a/cook	Sun May 22 16:58:44 2011 +0200
     1.2 +++ b/cook	Sun May 22 16:39:19 2011 +0100
     1.3 @@ -464,7 +464,7 @@
     1.4  							gettext "Installing dep (web/cache):"; echo " $i $vers"
     1.5  							tazpkg get-install $i >/dev/null
     1.6  						else
     1.7 -							# So package exist in wok but not available.
     1.8 +							# So package exists in wok but not available.
     1.9  							gettext "Missing dep (wok/pkg)     :"; echo " $i $vers"
    1.10  							echo $i >> $CACHE/missing
    1.11  						fi
    1.12 @@ -480,7 +480,7 @@
    1.13  		busybox diff installed.list installed.cook > installed.cook.diff
    1.14  	deps=$(cat installed.cook.diff | grep ^+[a-zA-Z0-9] | wc -l)
    1.15  	
    1.16 -	# Have we missing build dep to cook ?
    1.17 +	# Have we a missing build dep to cook ?
    1.18  	if [ -s "$CACHE/missing" ] && [ "$AUTO_COOK" ]; then
    1.19  		gettext -e "Auto cook config is set   : AUTO_COOK\n"
    1.20  		cp -f $LOGS/$PACKAGE.log $LOGS/$PACKAGE.log.$$
    1.21 @@ -497,8 +497,8 @@
    1.22  		mv  $LOGS/$PACKAGE.log.$$ $LOGS/$PACKAGE.log
    1.23  	fi
    1.24  	
    1.25 -	# QA: Exit on missing dep errors. We exit in both case, if AUTO_COOK
    1.26 -	# is enable and cook fail we have ERROR in log, if no auto cook we have
    1.27 +	# QA: Exit on missing dep errors. We exit in both cases, if AUTO_COOK
    1.28 +	# is enabled and cook fails we have ERROR in log, if no auto cook we have
    1.29  	# missing dep in cached file.
    1.30  	if fgrep -q "ERROR:" $LOGS/$pkg.log || [ -s "$CACHE/missing" ]; then
    1.31  		[ -s "$CACHE/missing" ] && nb=$(cat $CACHE/missing | wc -l)
    1.32 @@ -765,8 +765,8 @@
    1.33  		# Interactive mode, asking and seding.
    1.34  		case "$3" in
    1.35  			--interactive|-i)
    1.36 -				echo "Entering interactive mode..." 
    1.37 -				echo "================================================================================"
    1.38 +				gettext -e "Entering interactive mode...\n" 
    1.39 +				separator
    1.40  				echo "Package       : $pkg"
    1.41  				# Version.
    1.42  				echo -n "Version       : " ; read anser
    1.43 @@ -788,7 +788,7 @@
    1.44  				echo "Wget URL to download source tarball."
    1.45  				echo "Example  : \$GNU_MIRROR/\$PACKAGE/\$TARBALL"
    1.46  				echo -n "Wget url : " ; read anser
    1.47 -				sed -i s#'WGET_URL=\"\"'#"WGET_URL=\"$anser\""# receipt
    1.48 +				sed -i s#'WGET_URL=\"$TARBALL\"'#"WGET_URL=\"$anser\""# receipt
    1.49  				# Ask for a stuff dir.
    1.50  				echo -n "Do you need a stuff directory ? (y/N) : " ; read anser
    1.51  				if [ "$anser" = "y" ]; then
    1.52 @@ -801,8 +801,8 @@
    1.53  					echo -n "Creating the description.txt file..."
    1.54  					echo "" > $WOK/$pkg/description.txt && status
    1.55  				fi
    1.56 -				echo "================================================================================"
    1.57 -				echo "Receipt is ready to use."
    1.58 +				separator
    1.59 +				gettext -e "Receipt is ready to use.\n"
    1.60  				echo "" ;;
    1.61  		esac ;;
    1.62  	list)