bkuhn/small-hacks
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Differentiate between a remove_lock and the failure mode.

Browse source 
Ensure that if there isn't really a failure, we don't generate errors, but if
there is a failure, that goes into the conky output.
This commit is contained in:
Bradley M. Kuhn 2014-02-26 06:08:20 -05:00
parent 5f1d54bf4b
commit 7d91707c99
1 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
calendar-run.sh
View file

@ -13,21 +13,23 @@
/usr/bin/lockfile -r 8 ~/.running-calendar /usr/bin/lockfile -r 8 ~/.running-calendar
remove_lock() { remove_lock() {
set +e
/bin/rm -f ~/.running-calendar
trap - INT TERM EXIT
exit 0
}
remove_lock_and_fail() {
echo '${color5}' $! $# 'Failure in' $0 ': Aborting!'
/bin/rm -f ~/.running-calendar /bin/rm -f ~/.running-calendar
} }
# It's a TRAP!!! # It's a TRAP!!!
trap remove_lock INT TERM EXIT trap remove_lock_and_fail INT TERM EXIT
set -e set -e
HOME_MACHINE=baptist.ebb.org HOME_MACHINE=baptist.ebb.org
~/hacks/Small-Hacks/calendar-export.plx ~/Public-Configuration/calendar-export-home.config ~/hacks/Small-Hacks/calendar-export.plx ~/Public-Configuration/calendar-export-home.config
if [ $? -ne 0 ]; then
echo '${color5} Failure in $0: Aborting after export'
remove_lock
exit 1
fi
cd ~/calendars/personal/private/bkuhn cd ~/calendars/personal/private/bkuhn