From 3738e703b6c50e353f03daa8071f25cd18b4a84e Mon Sep 17 00:00:00 2001
From: Micke Nordin <kano@sunet.se>
Date: Wed, 26 Jun 2024 09:14:59 +0200
Subject: [PATCH] Clean up logic

---
 templates/script/backup-all-buckets.erb.sh | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/templates/script/backup-all-buckets.erb.sh b/templates/script/backup-all-buckets.erb.sh
index cf19cdc..c15b605 100644
--- a/templates/script/backup-all-buckets.erb.sh
+++ b/templates/script/backup-all-buckets.erb.sh
@@ -46,16 +46,20 @@ function do_backup {
 	ps aux | grep duplicity | grep "[^a-zA-Z]${bucket}" > /dev/null
 	local oktorun=$?   # 1 == this bucket has no other bakup process in progress
 	mkdir -p ${mountpoint}
-	[[ ${oktorun} -ne 0 ]] && rclone mount ${project}:${bucket} ${mountpoint}/ --daemon --allow-other --dir-cache-time 24h
-	rclone mkdir ${mirror}:${mirrorbucket}
-	[[ ${oktorun} -ne 0 ]] && duplicity --full-if-older-than 1M --asynchronous-upload --tempdir /mnt --archive-dir /mnt \
-		--no-encryption ${mountpoint} rclone://${mirror}:/${mirrorbucket} && \
-    [[ -n "${extra_backup_jobs[${customer}]}" ]] && [[ -f ${extra_backup_jobs[${customer} ]] && ${extra_backup_jobs[${customer}]}
-	umount ${mountpoint}
-	rmdir ${mountpoint}
-	# Clean up
-	[ ${oktorun} -ne 0 ] && duplicity remove-all-but-n-full ${number_of_full_to_keep} --tempdir /mnt --archive-dir /mnt \
+	if [[ ${oktorun} -ne 0 ]]; then
+    rclone mount ${project}:${bucket} ${mountpoint}/ --daemon --allow-other --dir-cache-time 24h
+    rclone mkdir ${mirror}:${mirrorbucket}
+	  duplicity --full-if-older-than 1M --asynchronous-upload --tempdir /mnt --archive-dir /mnt \
+		  --no-encryption ${mountpoint} rclone://${mirror}:/${mirrorbucket} 
+    if [[ -n "${extra_backup_jobs[${customer}]}" ]] && [[ -f ${extra_backup_jobs[${customer} ]]; then
+      ${extra_backup_jobs[${customer}]}
+    fi
+    umount ${mountpoint}
+    rmdir ${mountpoint}
+	  # Clean up
+	  duplicity remove-all-but-n-full ${number_of_full_to_keep} --tempdir /mnt --archive-dir /mnt \
 		--force rclone://${mirror}:/${mirrorbucket}
+  fi
 }
 
 for entry in "${projects[@]}"; do