From 11752bac3f47adf37223dd7e0581a20a797b8447 Mon Sep 17 00:00:00 2001
From: Michael Stanclift <mstanclift@vmware.com>
Date: Sat, 23 May 2020 18:50:29 -0500
Subject: [PATCH] New style push validate

---
 gravity-sync.sh | 28 ++++++++++++++++++++++------
 1 file changed, 22 insertions(+), 6 deletions(-)

diff --git a/gravity-sync.sh b/gravity-sync.sh
index 53c5387..5c00696 100755
--- a/gravity-sync.sh
+++ b/gravity-sync.sh
@@ -126,18 +126,34 @@ function push_gs {
 	select yn in "Yes" "No"; do
 		case $yn in
 		Yes )
-			# echo "Replacing gravity.db on primary"
-			echo -e "[${CYAN}STAT${NC}] Backing Up ${GRAVITY_FI} from ${REMOTE_HOST}"
+			
+			MESSAGE="Backing Up ${GRAVITY_FI} from ${REMOTE_HOST}"
+			echo -e "${STAT} ${MESSAGE}"
 				rsync -v -e 'ssh -p 22' ${REMOTE_USER}@${REMOTE_HOST}:${PIHOLE_DIR}/${GRAVITY_FI} $HOME/${LOCAL_FOLDR}/${BACKUP_FOLD}/${GRAVITY_FI}.push
-			echo -e "[${CYAN}STAT${NC}] Pushing ${GRAVITY_FI} to ${REMOTE_HOST}"
+				error_validate
+	
+			MESSAGE="Pushing ${GRAVITY_FI} to ${REMOTE_HOST}"
+			echo -e "${STAT} ${MESSAGE}"
 				rsync --rsync-path="sudo rsync" -v -e 'ssh -p 22' ${PIHOLE_DIR}/${GRAVITY_FI} ${REMOTE_USER}@${REMOTE_HOST}:${PIHOLE_DIR}/${GRAVITY_FI}
-			echo -e "[${CYAN}STAT${NC}] Applying Permissions to Remote ${GRAVITY_FI}"
+				error_validate
+	
+			MESSAGE="Setting Permissions on ${GRAVITY_FI}"
+			echo -e "${STAT} ${MESSAGE}"	
 				ssh ${REMOTE_USER}@${REMOTE_HOST} "sudo chmod 644 ${PIHOLE_DIR}/${GRAVITY_FI}"
+				error_validate
+		
+			MESSAGE="Setting Ownership on ${GRAVITY_FI}"
+			echo -e "${STAT} ${MESSAGE}"	
 				ssh ${REMOTE_USER}@${REMOTE_HOST} "sudo chown pihole:pihole ${PIHOLE_DIR}/${GRAVITY_FI}"
-			echo -e "[${CYAN}STAT${NC}] Reloading FTLDNS Configuration"
+				error_validate	
+	
+			MESSAGE="Reloading FTLDNS Configuration"
+			echo -e "${STAT} ${MESSAGE}"
 				ssh ${REMOTE_USER}@${REMOTE_HOST} 'pihole restartdns reloadlists'
 				ssh ${REMOTE_USER}@${REMOTE_HOST} 'pihole restartdns'
-				logs_export
+				error_validate
+			
+			logs_export
 			exit_withchange
 		;;