cookutils diff cook @ rev 49

cook + cooker + doc: add blocked functionality and information
author Christophe Lincoln <pankso@slitaz.org>
date Sat May 07 05:34:17 2011 +0200 (2011-05-07)
parents 8df3646e9d8f
children 7102d10a9fa8
line diff
     1.1 --- a/cook	Sat May 07 04:42:06 2011 +0200
     1.2 +++ b/cook	Sat May 07 05:34:17 2011 +0200
     1.3 @@ -40,6 +40,8 @@
     1.4    --clean|-c      Cook : $(gettext "clean the package in the wok.")
     1.5    --install|-i    Cook : $(gettext "cook and install the package.")
     1.6    --getsrc|-gs    Cook : $(gettext "get the package source tarball.")
     1.7 +  --block|-b      Cook : $(gettext "Block a package so cook will skip it.")
     1.8 +  --unblock|-ub   Cook : $(gettext "Unblock a blocked package.")
     1.9    --wok|-w        Setup: $(gettext "create also a wok from Hg repo.")
    1.10  
    1.11  EOT
    1.12 @@ -544,12 +546,10 @@
    1.13  
    1.14  		# Handle --options
    1.15  		case "$2" in
    1.16 -			--wok)
    1.17 +			--wok|-w)
    1.18  				[ ! -d "$INSTALLED/mercurial" ] && tazpkg get-install mercurial
    1.19  				[ -d "$WOK" ] && echo -e "A wok already exist.\n" && exit 1
    1.20  				hg clone $HG_URL ;;
    1.21 -			--chroot)
    1.22 -				echo "TODO: create a chroot with tazdev" ;;
    1.23  		esac
    1.24  
    1.25  		# SliTaz group and permissions
    1.26 @@ -659,7 +659,7 @@
    1.27  		check_pkg_in_wok && echo ""
    1.28  
    1.29  		# Skip blocked, 3 lines also for the Cooker.
    1.30 -		if grep -q ^$pkg$ $blocked; then
    1.31 +		if grep -q "^$pkg$" $blocked && [ "$2" == "--*" ]; then
    1.32  			gettext -e "Blocked package:"; echo -e " $pkg\n" && exit 0
    1.33  		fi
    1.34  
    1.35 @@ -672,15 +672,23 @@
    1.36  		# Handle --options
    1.37  		case "$2" in
    1.38  			--clean|-c)
    1.39 -				gettext -e "Cleaning package:"; echo -n " $pkg"
    1.40 +				gettext -e "Cleaning:"; echo -n " $pkg"
    1.41  				cd $WOK/$pkg && rm -rf install taz source
    1.42  				status && echo "" && exit 0 ;;
    1.43  			--install|-i)
    1.44  				inst='yes' ;;
    1.45 -			--getsrc)
    1.46 -				echo "Getting source for: $pkg"
    1.47 +			--getsrc|-gs)
    1.48 +				gettext "Getting source for:"; echo " $pkg"
    1.49  				separator && get_source
    1.50  				echo -e "Tarball: $SRC/$TARBALL\n" && exit 0 ;;
    1.51 +			--block|-b)
    1.52 +				gettext "Blocking:"; echo -n " $pkg"
    1.53 +				[ $(grep "^$pkg$" $blocked) ] || echo "$pkg" >> $blocked
    1.54 +				status && echo "" && exit 0 ;;
    1.55 +			--unblock|-ub)
    1.56 +				gettext "Unblocking:"; echo -n " $pkg"
    1.57 +				sed -i "/^${pkg}$/"d $blocked
    1.58 +				status && echo "" && exit 0 ;;
    1.59  		esac
    1.60  
    1.61  		# Check if wanted is build now so we have separate log files.