From 3e3b42ed25f984528307aa26e63ed954c4497c17 Mon Sep 17 00:00:00 2001
From: David Schroeder <david@schroedercity.com>
Date: Sat, 10 May 2025 15:33:26 -0500
Subject: [PATCH] update

---
 defaults.inc        |  2 +-
 nodemgmt-scripts.sh | 66 +++++++++++++++++++++++----------------------
 2 files changed, 35 insertions(+), 33 deletions(-)

diff --git a/defaults.inc b/defaults.inc
index cb51b341..1483b274 100755
--- a/defaults.inc
+++ b/defaults.inc
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-VERS='5.4.15-05102025'
+VERS='5.4.16-05102025'
 NM_BETA=false
 
 noheader=' service status-check nightlyrephp7.3-fpm,new backup report check checkcerts gitea update-nodes copynpmcerts singleservercheck update-dyndns backup-offsitepfsense gui nightlyreview update log betacheck offsite-staticroute-fix '
diff --git a/nodemgmt-scripts.sh b/nodemgmt-scripts.sh
index 7d1a66c6..b090518e 100755
--- a/nodemgmt-scripts.sh
+++ b/nodemgmt-scripts.sh
@@ -650,22 +650,23 @@ BACKUP_UNIFIUDM(){
 
 		ssh -q -o ConnectTimeout=3 -o ConnectionAttempts=1 root@${UNIFIUDM_IP} tar -c -f /volume1/data_backup.tar.gz /data
 		ssh -q -o ConnectTimeout=3 -o ConnectionAttempts=1 root@${UNIFIUDM_IP} tar -c -f /volume1/root_backup.tar.gz /root
-		scp root@${UNIFIUDM_IP}:/volume1/*_backup.tar.gz ${BAKFOLDER}/${newBAKFOLDER}/
-		ssh -q -o ConnectTimeout=3 -o ConnectionAttempts=1 root@${UNIFIUDM_IP} rm -f /volume1/*_backup.tar.gz
+		if [ $(scp root@${UNIFIUDM_IP}:/volume1/*_backup.tar.gz ${BAKFOLDER}/${newBAKFOLDER}/) ]; then
+			ssh -q -o ConnectTimeout=3 -o ConnectionAttempts=1 root@${UNIFIUDM_IP} rm -f /volume1/*_backup.tar.gz
 		
-		cd ${BAKFOLDER}
-		if [ "$(date +%d)" == "${DOM}" ] && [ "$(date +%u)" == "${DOW}" ]; then
-			mv ${newBAKFOLDER} "${newBAKFOLDER}-M"
-			ln -s "${newBAKFOLDER}-M" "${newBAKFOLDER}-W"
-			ln -s "${newBAKFOLDER}-M" "${newBAKFOLDER}-D"
-		elif [ "$(date +%d)" == "${DOM}" ]; then
-			mv ${newBAKFOLDER} "${newBAKFOLDER}-M"
-			ln -s "${newBAKFOLDER}-M" "${newBAKFOLDER}-D"
-		elif [ "$(date +%u)" == "${DOW}" ]; then
-			mv ${newBAKFOLDER} "${newBAKFOLDER}-W"
-			ln -s "${newBAKFOLDER}-W" "${newBAKFOLDER}-D"
-		else
-			mv ${newBAKFOLDER} "${newBAKFOLDER}-D"
+			cd ${BAKFOLDER}
+			if [ "$(date +%d)" == "${DOM}" ] && [ "$(date +%u)" == "${DOW}" ]; then
+				mv ${newBAKFOLDER} "${newBAKFOLDER}-M"
+				ln -s "${newBAKFOLDER}-M" "${newBAKFOLDER}-W"
+				ln -s "${newBAKFOLDER}-M" "${newBAKFOLDER}-D"
+			elif [ "$(date +%d)" == "${DOM}" ]; then
+				mv ${newBAKFOLDER} "${newBAKFOLDER}-M"
+				ln -s "${newBAKFOLDER}-M" "${newBAKFOLDER}-D"
+			elif [ "$(date +%u)" == "${DOW}" ]; then
+				mv ${newBAKFOLDER} "${newBAKFOLDER}-W"
+				ln -s "${newBAKFOLDER}-W" "${newBAKFOLDER}-D"
+			else
+				mv ${newBAKFOLDER} "${newBAKFOLDER}-D"
+			fi
 		fi
 		
 		dailyfilestokeep=(`ls  -d ${BAKFOLDER}/*-D 2> /dev/null | tail -${DailyBackupsToKeep}`)
@@ -687,7 +688,7 @@ BACKUP_UNIFIUDM(){
 					fi
 				done;
 				if [ $keep == 0 ]; then
-					delFolder="V:\\UniFi-Backups\\UniFi-UDM_Backups\\${folder##*/}"
+					delFolder="D:\\BackupSync\\UniFi-Backups\\UniFi-UDM_Backups\\${folder##*/}"
 					ssh -q -o ConnectTimeout=3 -o ConnectionAttempts=1 backup@10.10.1.60 cmd /C rmdir /S /Q "${delFolder}"
 				fi
 			fi
@@ -724,22 +725,23 @@ BACKUP_UNIFINVR(){
 		ssh -q -o ConnectTimeout=3 -o ConnectionAttempts=1 root@${UNIFINVR_IP} tar -c -f /volume1/root_backup.tar.gz /root
 		ssh -q -o ConnectTimeout=3 -o ConnectionAttempts=1 root@${UNIFINVR_IP} tar -c -f /volume1/unifi_backup.tar.gz /volume1/.srv/unifi-protect/backups /volume1/.srv/unifi-protect/data /volume1/.srv/unifi-protect/dbBackups
 		
-		scp root@${UNIFINVR_IP}:/volume1/*_backup.tar.gz ${BAKFOLDER}/${newBAKFOLDER}/
-		ssh -q -o ConnectTimeout=3 -o ConnectionAttempts=1 root@${UNIFINVR_IP} rm -f /volume1/*_backup.tar.gz
+		if [ $(scp root@${UNIFINVR_IP}:/volume1/*_backup.tar.gz ${BAKFOLDER}/${newBAKFOLDER}/) ]; then
+			ssh -q -o ConnectTimeout=3 -o ConnectionAttempts=1 root@${UNIFINVR_IP} rm -f /volume1/*_backup.tar.gz
 		
-		cd ${BAKFOLDER}
-		if [ "$(date +%d)" == "${DOM}" ] && [ "$(date +%u)" == "${DOW}" ]; then
-			mv ${newBAKFOLDER} "${newBAKFOLDER}-M"
-			ln -s "${newBAKFOLDER}-M" "${newBAKFOLDER}-W"
-			ln -s "${newBAKFOLDER}-M" "${newBAKFOLDER}-D"
-		elif [ "$(date +%d)" == "${DOM}" ]; then
-			mv ${newBAKFOLDER} "${newBAKFOLDER}-M"
-			ln -s "${newBAKFOLDER}-M" "${newBAKFOLDER}-D"
-		elif [ "$(date +%u)" == "${DOW}" ]; then
-			mv ${newBAKFOLDER} "${newBAKFOLDER}-W"
-			ln -s "${newBAKFOLDER}-W" "${newBAKFOLDER}-D"
-		else
-			mv ${newBAKFOLDER} "${newBAKFOLDER}-D"
+			cd ${BAKFOLDER}
+			if [ "$(date +%d)" == "${DOM}" ] && [ "$(date +%u)" == "${DOW}" ]; then
+				mv ${newBAKFOLDER} "${newBAKFOLDER}-M"
+				ln -s "${newBAKFOLDER}-M" "${newBAKFOLDER}-W"
+				ln -s "${newBAKFOLDER}-M" "${newBAKFOLDER}-D"
+			elif [ "$(date +%d)" == "${DOM}" ]; then
+				mv ${newBAKFOLDER} "${newBAKFOLDER}-M"
+				ln -s "${newBAKFOLDER}-M" "${newBAKFOLDER}-D"
+			elif [ "$(date +%u)" == "${DOW}" ]; then
+				mv ${newBAKFOLDER} "${newBAKFOLDER}-W"
+				ln -s "${newBAKFOLDER}-W" "${newBAKFOLDER}-D"
+			else
+				mv ${newBAKFOLDER} "${newBAKFOLDER}-D"
+			fi
 		fi
 		
 		dailyfilestokeep=(`ls  -d ${BAKFOLDER}/*-D 2> /dev/null | tail -${DailyBackupsToKeep}`)
@@ -761,7 +763,7 @@ BACKUP_UNIFINVR(){
 					fi
 				done;
 				if [ $keep == 0 ]; then
-					delFolder="V:\\UniFi-Backups\\UniFi-NVR_Backups\\${folder##*/}"
+					delFolder="D:\\BackupSync\\UniFi-Backups\\UniFi-NVR_Backups\\${folder##*/}"
 					ssh -q -o ConnectTimeout=3 -o ConnectionAttempts=1 backup@10.10.1.60 cmd /C rmdir /S /Q "${delFolder}"
 				fi
 			fi