From 2add786e4cc6765b63f43e2bc3407e0b619490e0 Mon Sep 17 00:00:00 2001 From: Silvio Rhatto Date: Sat, 26 May 2018 09:35:56 -0300 Subject: Check exit status globally --- borger | 30 +++++++++++++++++++++++------- 1 file changed, 23 insertions(+), 7 deletions(-) diff --git a/borger b/borger index 705c539..5b002b9 100755 --- a/borger +++ b/borger @@ -127,9 +127,9 @@ function borger_create { backup_exit=$? - if [ "$backup_exit" != "0" ]; then - fatal "Error creating snapshot" - fi + #if [ "$backup_exit" != "0" ]; then + # fatal "Error creating snapshot" + #fi } # Use the `prune` subcommand to maintain daily, weekly and monthly archives. @@ -145,11 +145,11 @@ function borger_prune { --keep-weekly $KEEPWEEKLY \ --keep-monthly $KEEPMONTHLY \ - prune_exit=$? + prune_exit=$? - if [ "$prune_exit" != "0" ]; then - fatal "Error pruning repository" - fi + #if [ "$prune_exit" != "0" ]; then + # fatal "Error pruning repository" + #fi } # Main backup procedure @@ -159,6 +159,22 @@ function borger_run { borger_init borger_create borger_prune + borger_exit +} + +function borger_exit { + # Use highest exit code as global exit code + global_exit=$(( backup_exit > prune_exit ? backup_exit : prune_exit )) + + if [ ${global_exit} -eq 1 ]; then + info "Backup and/or Prune finished with a warning" + fi + + if [ ${global_exit} -gt 1 ]; then + info "Backup and/or Prune finished with an error" + fi + + exit ${global_exit} } # Ensure we have our base config folder -- cgit v1.2.3