# HG changeset patch # User Eric Joseph-Alexandre # Date 1368078128 -7200 # Node ID b143175d2095dde092caaf592d4b6a4e9d7863ef # Parent e581753919b4f64ff16b096ad39841176be6be8b pizza-bot: Add status and fix trap command diff -r e581753919b4 -r b143175d2095 pizza-bot --- a/pizza-bot Wed May 08 15:41:48 2013 +0200 +++ b/pizza-bot Thu May 09 07:42:08 2013 +0200 @@ -6,6 +6,7 @@ # # Copyright (C) 2012 SliTaz GNU/Linux - GNU gpl v2 # Authors : Christophe Lincoln +# Eric Joseph-Alexandre # VERSION=1.0 @@ -22,6 +23,32 @@ lockfile="/var/lock/pizza.lock" feeds="$pizza/xml" +trap 'rm -f $lockfile ; exit 1' TERM INT + +# Help +usage() { + echo "PizzaBot v$VERSION" + echo "Usage: $(basename $0) [lock|unlock]" + exit 0 +} + +# Get status +status(){ + if [ -f "$lockfile" ]; then + ps | grep ^`cat $lockfile` \ + && echo "Pizza is running." \ + || echo "Pizza is locked but not running!" + else + echo "Pizza iis not running." + fi + echo "Flavor in queue: $(ls $queue | wc -l)" +} + + +# Logger: Write log +_logger() { + printf "%s pizza-bot: %s\n" `date '+%D %H'` $@ +} # Log activities, we want first letter capitalized. log() { @@ -83,15 +110,17 @@ # Run as daemon by default. case "$1" in - usage) - echo "Usage: $(basename $0) [lock|unlock]" ;; + help|-h) + usage ;; + status) + status ;; lock) echo $$ > $lockfile ;; unlock) rm -f $lockfile ;; *) [ -f "$lockfile" ] && echo "Pizza is locked" && exit 0 - trap 'rm -f $command && exit 1' INT TERM + #~ trap 'rm -f $command && exit 1' INT TERM echo $$ > $lockfile name=$(ls -rt $queue | head -n 1) log="$public/$name/distro.log"