diff --git a/README.md b/README.md index 7524f75..2b01351 100644 --- a/README.md +++ b/README.md @@ -196,6 +196,8 @@ PRE_COMMANDS: |- ``` The commands specified in `PRE_COMMANDS` are executed one by one. +In case of a failure, `PRE_COMMANDS_FAILURE` will be executed, if set. +The backup will be aborted if `ABORT_ON_PRE_COMMANDS_FAILURE` is set to `"true"`. ## Execute commands after backup diff --git a/backup b/backup index 278054b..03e4186 100755 --- a/backup +++ b/backup @@ -2,8 +2,15 @@ set -eo pipefail function run_commands { - COMMANDS=$1 - while IFS= read -r cmd; do echo "$cmd" && eval "$cmd" ; done < <(printf '%s\n' "$COMMANDS") + COMMANDS=$1 + RESULT=0 + while IFS= read -r cmd; do + echo "$cmd" && eval "$cmd" + if [ $? -ne 0 ]; then + RESULT=1 + fi + done < <(printf '%s\n' "$COMMANDS") + return $RESULT } function run_exit_commands { @@ -42,7 +49,19 @@ touch /run/lock/backup.lock trap run_exit_commands EXIT +set +e run_commands "${PRE_COMMANDS:-}" +pre_result=$? +set -e +if [ $pre_result -ne 0 ]; then + echo "Warning: At least one command of PRE_COMMANDS exited with a non-zero exit code." + run_commands "${PRE_COMMANDS_FAILURE:-}" + + if [ "${ABORT_ON_PRE_COMMANDS_FAILURE:-}" == "true" ]; then + rm -f /run/lock/backup.lock + exit 1 + fi +fi IFS=" " read -r -a RESTIC_BACKUP_SOURCES <<< "$(replace_spaces "${RESTIC_BACKUP_SOURCES:-/data}")" RESTIC_BACKUP_TAGS="${RESTIC_BACKUP_TAGS:-}" diff --git a/check b/check index 563fdcf..6d7467e 100755 --- a/check +++ b/check @@ -2,8 +2,15 @@ set -euo pipefail function run_commands { - COMMANDS=$1 - while IFS= read -r cmd; do echo $cmd && eval $cmd ; done < <(printf '%s\n' "$COMMANDS") + COMMANDS=$1 + RESULT=0 + while IFS= read -r cmd; do + echo "$cmd" && eval "$cmd" + if [ $? -ne 0 ]; then + RESULT=1 + fi + done < <(printf '%s\n' "$COMMANDS") + return $RESULT } function run_exit_commands { @@ -13,7 +20,18 @@ function run_exit_commands { } main() { + set +e run_commands "${PRE_COMMANDS:-}" + pre_result=$? + set -e + if [ $pre_result -ne 0 ]; then + echo "Warning: At least one command of PRE_COMMANDS exited with a non-zero exit code." + run_commands "${PRE_COMMANDS_FAILURE:-}" + + if [ "${ABORT_ON_PRE_COMMANDS_FAILURE:-}" == "true" ]; then + exit 1 + fi + fi start=$(date +%s) echo Starting check at "$(date +"%Y-%m-%d %H:%M:%S")" diff --git a/prune b/prune index 11c7053..8ae6fd5 100755 --- a/prune +++ b/prune @@ -2,8 +2,15 @@ set -euo pipefail function run_commands { - COMMANDS=$1 - while IFS= read -r cmd; do echo $cmd && eval $cmd ; done < <(printf '%s\n' "$COMMANDS") + COMMANDS=$1 + RESULT=0 + while IFS= read -r cmd; do + echo "$cmd" && eval "$cmd" + if [ $? -ne 0 ]; then + RESULT=1 + fi + done < <(printf '%s\n' "$COMMANDS") + return $RESULT } function run_exit_commands { @@ -13,7 +20,18 @@ function run_exit_commands { } main() { + set +e run_commands "${PRE_COMMANDS:-}" + pre_result=$? + set -e + if [ $pre_result -ne 0 ]; then + echo "Warning: At least one command of PRE_COMMANDS exited with a non-zero exit code." + run_commands "${PRE_COMMANDS_FAILURE:-}" + + if [ "${ABORT_ON_PRE_COMMANDS_FAILURE:-}" == "true" ]; then + exit 1 + fi + fi start=$(date +%s)