From 4002148643043d748148b9591ab5e61a373c7c15 Mon Sep 17 00:00:00 2001 From: "Kyle J. McKay" Date: Wed, 28 Jan 2015 15:10:39 -0800 Subject: [PATCH] shlib.sh/update.sh: refactor some banged code --- jobd/update.sh | 4 ++-- shlib.sh | 10 ++++++++++ 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/jobd/update.sh b/jobd/update.sh index 2e79e9d..c78ae40 100755 --- a/jobd/update.sh +++ b/jobd/update.sh @@ -256,13 +256,13 @@ fi rm -f .refs-before .refs-after .refs-temp -if [ -e .banged ]; then +if is_banged; then [ -z "$mailaddrs" ] || { echo "$proj update succeeded - failure recovery" echo "this status message may be disabled on the project admin page" } | mail -s "[$cfg_name] $proj update succeeded" "$mailaddrs" || : - rm -f .banged .bangagain + bang_reset fi progress "- [$proj] update (`date`)" diff --git a/shlib.sh b/shlib.sh index 038d4b5..0304a82 100644 --- a/shlib.sh +++ b/shlib.sh @@ -196,6 +196,16 @@ bang_setup() { trap "rm \"\$bang_log\"" EXIT } +# Remove banged status +bang_reset() { + rm -f .banged .bangagain +} + +# Check to see if banged status +is_banged() { + [ -e .banged ] +} + # Progress report - if show_progress is set, shows the given message. progress() { -- 2.11.4.GIT