3.4.4 (#201)

Co-authored-by: Michael Stanclift <vmstan@ms-constitution.local>

VERSION

@@ -1 +1 @@
-3.4.2
+3.4.4

gravity-sync.sh

@@ -3,7 +3,7 @@ SCRIPT_START=$SECONDS
 
 # GRAVITY SYNC BY VMSTAN #####################
 PROGRAM='Gravity Sync'
-VERSION='3.4.2'
+VERSION='3.4.4'
 
 # For documentation or downloading updates visit https://github.com/vmstan/gravity-sync
 # Requires Pi-Hole 5.x or higher already be installed, for help visit https://pi-hole.net

includes/gs-backup.sh

@@ -45,6 +45,12 @@ function backup_local_gravity_integrity() {
         MESSAGE="${UI_BACKUP_INTEGRITY_FAILED} ${UI_GRAVITY_NAME}"
         echo_fail
         
+        MESSAGE="${UI_BACKUP_INTEGRITY_DELETE} ${UI_GRAVITY_NAME}"
+        echo_stat
+            
+        sudo rm ${LOCAL_FOLDR}/${BACKUP_FOLD}/${BACKUPTIMESTAMP}-${GRAVITY_FI}.backup
+        error_validate
+        
         exit_nochange
     fi
 }
@@ -104,6 +110,13 @@ function backup_remote_gravity_integrity() {
         MESSAGE="${UI_BACKUP_INTEGRITY_FAILED} ${UI_GRAVITY_NAME}"
         echo_fail
         
+        MESSAGE="{UI_BACKUP_INTEGRITY_DELETE} ${UI_GRAVITY_NAME}"
+        echo_stat
+        
+        CMD_TIMEOUT='15'
+        CMD_REQUESTED="sudo rm ${RIHOLE_DIR}/${GRAVITY_FI}.backup"
+        create_sshcmd
+        
         exit_nochange
     fi
 }

includes/gs-ui.sh

@@ -83,6 +83,7 @@ UI_BACKUP_PURGE='Purging redundant backups on secondary Pi-hole instance'
 UI_BACKUP_REMAIN='days of backups remain'
 UI_BACKUP_INTEGRITY="Checking ${UI_GRAVITY_NAME} backup integrity"
 UI_BACKUP_INTEGRITY_FAILED='Integrity check has failed for the primary'
+UI_BACKUP_INTEGRITY_DELETE='Removing failed backup'
 
 # Restore
 UI_RESTORE_WARNING="This will overwrite your current Pi-hole settings on $HOSTNAME with a previous version!"