slitaz-pizza rev 98

pizza-bot: Add status and fix trap command
author Eric Joseph-Alexandre <erjo@slitaz.org>
date Thu May 09 07:42:08 2013 +0200 (2013-05-09)
parents e581753919b4
children 4fcff5839281
files pizza-bot
line diff
     1.1 --- a/pizza-bot	Wed May 08 15:41:48 2013 +0200
     1.2 +++ b/pizza-bot	Thu May 09 07:42:08 2013 +0200
     1.3 @@ -6,6 +6,7 @@
     1.4  #
     1.5  # Copyright (C) 2012 SliTaz GNU/Linux - GNU gpl v2
     1.6  # Authors : Christophe Lincoln <pankso@slitaz.org>
     1.7 +#			Eric Joseph-Alexandre <erjo@slitaz.org>
     1.8  #
     1.9  
    1.10  VERSION=1.0
    1.11 @@ -22,6 +23,32 @@
    1.12  lockfile="/var/lock/pizza.lock"
    1.13  feeds="$pizza/xml"
    1.14  
    1.15 +trap 'rm -f $lockfile ; exit 1' TERM INT
    1.16 +
    1.17 +# Help
    1.18 +usage() {
    1.19 +		echo "PizzaBot v$VERSION"
    1.20 +		echo "Usage: $(basename $0) [lock|unlock]"
    1.21 +		exit 0
    1.22 +}
    1.23 +
    1.24 +# Get status
    1.25 +status(){
    1.26 +	if [ -f "$lockfile" ]; then
    1.27 +		ps | grep ^`cat $lockfile`  \
    1.28 +			&& echo "Pizza is running." \
    1.29 +			|| echo  "Pizza is locked but not running!"
    1.30 +	else
    1.31 +		echo  "Pizza iis not running."
    1.32 +	fi
    1.33 +	echo  "Flavor in queue: $(ls $queue | wc -l)"
    1.34 +}
    1.35 +
    1.36 +
    1.37 +# Logger: Write log
    1.38 +_logger() {
    1.39 +	printf "%s pizza-bot: %s\n"  `date '+%D %H'` $@
    1.40 +}
    1.41  
    1.42  # Log activities, we want first letter capitalized.
    1.43  log() {
    1.44 @@ -83,15 +110,17 @@
    1.45  
    1.46  # Run as daemon by default.
    1.47  case "$1" in
    1.48 -	usage)
    1.49 -		echo "Usage: $(basename $0) [lock|unlock]" ;;
    1.50 +	help|-h)
    1.51 +		usage ;;
    1.52 +	status)
    1.53 +		status ;;
    1.54  	lock)
    1.55  		echo $$ > $lockfile ;;
    1.56  	unlock)
    1.57  		rm -f $lockfile ;;
    1.58  	*)
    1.59  		[ -f "$lockfile" ] && echo "Pizza is locked" && exit 0
    1.60 -		trap 'rm -f $command && exit 1' INT TERM
    1.61 +		#~ trap 'rm -f $command && exit 1' INT TERM
    1.62  		echo $$ > $lockfile
    1.63  		name=$(ls -rt $queue | head -n 1)
    1.64  		log="$public/$name/distro.log"