From 342178ed8f8753ae67e9dde97a60142d9ac3074e Mon Sep 17 00:00:00 2001
From: thomasabishop <tactonbishop@gmail.com>
Date: Sun, 20 Apr 2025 17:22:37 +0100
Subject: [PATCH] tweak Hetzner backup script

---
 storagebox_alpha_backup.sh | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/storagebox_alpha_backup.sh b/storagebox_alpha_backup.sh
index e4b32e0..eed8d2b 100755
--- a/storagebox_alpha_backup.sh
+++ b/storagebox_alpha_backup.sh
@@ -12,6 +12,17 @@ RCHAT_NOTIFIER="${HOME}/repos/utilities/rocketchat_notifier.sh"
 SOURCE_MOUNTPOINT="/media/hetzner-storagebox-alpha"
 LOCAL_MOUNTPOINT="/media/my-passport"
 
+function clean_up() {
+	# Dismount NAS
+	echo "INFO Dismounting ${NAS_DEVICE_NAME}."
+	sudo umount /media/hetzner-storagebox-alpha/
+
+	# Turn on VPN
+	echo "INFO Re-connecting Mullvad VPN."
+	mullvad connect
+	exit
+}
+
 # Turn off VPN
 echo "INFO Attempting backup of ${NAS_DEVICE_NAME} NAS device."
 echo "INFO Checking VPN status."
@@ -36,7 +47,7 @@ else
 	else
 		$RCHAT_NOTIFIER "backups" "error" \
 			"Could not complete scheduled backup of ${NAS_DEVICE_NAME}. Local backup disk (/media/my-passport) not mounted."
-		exit
+		clean_up
 	fi
 fi
 
@@ -49,7 +60,7 @@ if mountpoint -q ${SOURCE_MOUNTPOINT}; then
 else
 	$RCHAT_NOTIFIER "backups" "error" \
 		"Could not complete scheduled ${NAS_DEVICE_NAME} backup. Source disk (/media/hetzner-storagebox-alpha) not mounted."
-	exit
+	clean_up
 fi
 
 # Create backup (ignoring lock files)
@@ -75,12 +86,4 @@ else
 		"Failed to create backup of ${NAS_DEVICE_NAME}: problem with rsync (exit code $STATUS)."
 fi
 
-# Dismount NAS
-echo "INFO Dismounting ${NAS_DEVICE_NAME}."
-sudo umount /media/hetzner-storagebox-alpha/
-
-# Turn on VPN
-echo "INFO Re-connecting Mullvad VPN."
-mullvad connect
-
-exit
+clean_up