From 15451b32f2f61a5575a3a12043f99ab1ce0bf9ef Mon Sep 17 00:00:00 2001
From: Michael Stanclift <mstanclift@vmware.com>
Date: Tue, 26 May 2020 12:26:21 -0500
Subject: [PATCH] Reverting Jim's method

Keeping backup before pull for safety
---
 gravity-sync.sh | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/gravity-sync.sh b/gravity-sync.sh
index 8627282..11eb3c7 100755
--- a/gravity-sync.sh
+++ b/gravity-sync.sh
@@ -115,7 +115,12 @@ function pull_gs {
 	
 	MESSAGE="Pulling ${GRAVITY_FI} from ${REMOTE_HOST}"
 	echo -en "${STAT} ${MESSAGE}"
-		${SSHPASSWORD} rsync -pog -b --backup-dir=$HOME/${LOCAL_FOLDR}/${BACKUP_FOLD} --suffix=.pull -e 'ssh -p 22' ${REMOTE_USER}@${REMOTE_HOST}:${PIHOLE_DIR}/${GRAVITY_FI} ${PIHOLE_DIR} >/dev/null 2>&1
+		${SSHPASSWORD} rsync -v -e 'ssh -p 22' ${REMOTE_USER}@${REMOTE_HOST}:${PIHOLE_DIR}/${GRAVITY_FI} $HOME/${LOCAL_FOLDR}/${BACKUP_FOLD}/${GRAVITY_FI}.pull >/dev/null 2>&1
+		error_validate
+		
+	MESSAGE="Replacing ${GRAVITY_FI} on $HOSTNAME"
+	echo -en "${STAT} ${MESSAGE}"	
+		sudo cp -v $HOME/${LOCAL_FOLDR}/${BACKUP_FOLD}/${GRAVITY_FI}.pull ${PIHOLE_DIR}/${GRAVITY_FI} >/dev/null 2>&1
 		error_validate
 	
 	MESSAGE="Validating Ownership on ${GRAVITY_FI}"