cookutils diff cook @ rev 933

cook: fix commands --clean, --getsrc, --block, --unblock; lighttpd/index.cgi: add rich statistics on main page.
author Aleksej Bobylev <al.bobylev@gmail.com>
date Sun Jun 18 15:13:29 2017 +0300 (2017-06-18)
parents 9a70c8fdc40c
children e4202f708ddb
line diff
     1.1 --- a/cook	Sat Jun 17 23:56:37 2017 +0300
     1.2 +++ b/cook	Sun Jun 18 15:13:29 2017 +0300
     1.3 @@ -91,7 +91,8 @@
     1.4  	_ 'Creating directories structure in "%s"' "$SLITAZ"
     1.5  	mkdir -p $WOK $PKGS $SRC $CACHE $LOGS $FEEDS
     1.6  	_ 'Creating DB files in "%s"' "$CACHE"
     1.7 -	touch $activity $command $broken $blocked
     1.8 +	touch $activity $command $broken $blocked $CACHE/webstat
     1.9 +	chown www:www $cache/webstat
    1.10  }
    1.11  
    1.12  
    1.13 @@ -1462,7 +1463,55 @@
    1.14  #
    1.15  
    1.16  # cook <package> --deps
    1.17 -[ -n "$deps" ] && { @@PREFIX@@/libexec/cookutils/deps $1; exit 0; }
    1.18 +[ -n "$deps" ] && {
    1.19 +	@@PREFIX@@/libexec/cookutils/deps $1
    1.20 +	exit 0
    1.21 +}
    1.22 +
    1.23 +# cook <package> --clean
    1.24 +# cook <package> -c
    1.25 +[ -n "$clean" -o "$2" == '-c' ] && {
    1.26 +	action 'Cleaning "%s"' "$1"
    1.27 +	cd $WOK/$1; rm -rf install taz source
    1.28 +	status; newline
    1.29 +	touch $activity		# update $activity -> something changed -> update webstat
    1.30 +	exit 0
    1.31 +}
    1.32 +
    1.33 +# cook <package> --getsrc
    1.34 +# cook <package> -gs
    1.35 +[ -n "$getsrc" -o "$2" == '-gs' ] && {
    1.36 +	title 'Getting source for "%s"' "$1"
    1.37 +	receipt="$WOK/$pkg/receipt"
    1.38 +	check_pkg_in_wok
    1.39 +	unset_receipt
    1.40 +	. $receipt
    1.41 +	get_source
    1.42 +	_ 'Tarball: %s' "$SRC/$TARBALL"; newline
    1.43 +	exit 0
    1.44 +}
    1.45 +
    1.46 +# cook <package> --block
    1.47 +# cook <package> -b
    1.48 +[ -n "$block" -o "$2" == '-b' ] && {
    1.49 +	action 'Blocking package "%s"' "$1"
    1.50 +	[ $(grep "^$1$" $blocked) ] || echo "$1" >> $blocked
    1.51 +	status; newline
    1.52 +	touch $activity
    1.53 +	exit 0
    1.54 +}
    1.55 +
    1.56 +# cook <package> --unblock
    1.57 +# cook <package> -ub
    1.58 +[ -n "$unblock" -o "$2" == '-ub' ] && {
    1.59 +	action 'Unblocking package "%s"' "$1"
    1.60 +	sed -i "/^$1$/d" $blocked
    1.61 +	status; newline
    1.62 +	touch $activity
    1.63 +	exit 0
    1.64 +}
    1.65 +
    1.66 +
    1.67  
    1.68  
    1.69  case "$1" in
    1.70 @@ -1841,33 +1890,9 @@
    1.71  
    1.72  		# Handle --options
    1.73  		case "$2" in
    1.74 -			--clean|-c)
    1.75 -				action 'Cleaning "%s"' "$pkg"
    1.76 -				cd $WOK/$pkg; rm -rf install taz source
    1.77 -				status; newline
    1.78 -				exit 0 ;;
    1.79 -
    1.80  			--install|-i)
    1.81  				inst='yes' ;;
    1.82  
    1.83 -			--getsrc|-gs)
    1.84 -				title 'Getting source for "%s"' "$pkg"
    1.85 -				get_source
    1.86 -				_ 'Tarball: %s' "$SRC/$TARBALL"; newline
    1.87 -				exit 0 ;;
    1.88 -
    1.89 -			--block|-b)
    1.90 -				action 'Blocking package "%s"' "$pkg"
    1.91 -				[ $(grep "^$pkg$" $blocked) ] || echo "$pkg" >> $blocked
    1.92 -				status; newline
    1.93 -				exit 0 ;;
    1.94 -
    1.95 -			--unblock|-ub)
    1.96 -				action 'Unblocking package "%s"' "$pkg"
    1.97 -				sed -i "/^${pkg}$/d" $blocked
    1.98 -				status; newline
    1.99 -				exit 0 ;;
   1.100 -
   1.101  			--pack)
   1.102  				[ -d "$WOK/$pkg/install" ] || die 'Need to build "%s"' "$pkg"
   1.103  				[ ! -d "$WOK/$pkg/taz" ] || rm -rf "$WOK/$pkg/taz"