From bcaf3db8a6a20d863ea5f672d5b76dc3884871a3 Mon Sep 17 00:00:00 2001
From: Silvio Rhatto <rhatto@riseup.net>
Date: Sat, 26 May 2018 10:14:16 -0300
Subject: Borg: check exit codes globally

---
 templates/borg.sh.erb | 34 ++++++++++++++++------------------
 1 file changed, 16 insertions(+), 18 deletions(-)

diff --git a/templates/borg.sh.erb b/templates/borg.sh.erb
index c32d63e..eab1a43 100644
--- a/templates/borg.sh.erb
+++ b/templates/borg.sh.erb
@@ -71,9 +71,9 @@ borg create                          \
 
   backup_exit=$?
 
-if [ "$backup_exit" != "0" ]; then
-  fatal "Error creating snapshot"
-fi
+#if [ "$backup_exit" != "0" ]; then
+#  fatal "Error creating snapshot"
+#fi
 
 info "Pruning repository..."
 
@@ -92,21 +92,19 @@ borg prune                            \
 
   prune_exit=$?
 
-if [ "$prune_exit" != "0" ]; then
-  fatal "Error pruning repository"
+#if [ "$prune_exit" != "0" ]; then
+#  fatal "Error pruning repository"
+#fi
+
+# 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
+  fatal "Backup and/or Prune finished with an error"
 fi
 
-# 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}
-- 
cgit v1.2.3