From 8836be495d0f80bdbab3d1611027c2048f59a3e3 Mon Sep 17 00:00:00 2001
From: Michael Stanclift <mstanclift@vmware.com>
Date: Mon, 1 Jun 2020 15:17:01 -0500
Subject: [PATCH] sed 's/\s.*$//'

---
 CHANGELOG.md    |  1 +
 gravity-sync.sh | 12 ++++--------
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c31bb38..6dfe55f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,6 +16,7 @@
 - Attempts to install OpenSSH Client if not found, and Dropbear is not alternative.
 - Fix bug with `dropbearkey` not finding .ssh folder.
 - Numerous fixes to accomidate DietPi in general.
+- Fixes issue where `compare` function would show changes where actually none existed.
 
 #### 1.7.5
 - No code changes!
diff --git a/gravity-sync.sh b/gravity-sync.sh
index 8bf88f8..5395e7c 100755
--- a/gravity-sync.sh
+++ b/gravity-sync.sh
@@ -732,13 +732,12 @@ function md5_compare {
 
 	MESSAGE="Analyzing ${REMOTE_HOST} ${GRAVITY_FI}"
 	echo_stat
-	# if [ "$SSH_CMD" = "dbclient" ]; then echo ''; fi;
-	primaryDBMD5=$(${SSHPASSWORD} ${SSH_CMD} -p ${SSH_PORT} -i "$HOME/${SSH_PKIF}" ${REMOTE_USER}@${REMOTE_HOST} "md5sum ${PIHOLE_DIR}/${GRAVITY_FI}" >/dev/null 2>&1) 
+	primaryDBMD5=$(${SSHPASSWORD} ${SSH_CMD} -p ${SSH_PORT} -i "$HOME/${SSH_PKIF}" ${REMOTE_USER}@${REMOTE_HOST} "md5sum ${PIHOLE_DIR}/${GRAVITY_FI}" | sed 's/\s.*$//') 
 		error_validate
 	
 	MESSAGE="Analyzing $HOSTNAME ${GRAVITY_FI}"
 	echo_stat
-	secondDBMD5=$(md5sum ${PIHOLE_DIR}/${GRAVITY_FI})
+	secondDBMD5=$(md5sum ${PIHOLE_DIR}/${GRAVITY_FI} | sed 's/\s.*$//')
 		error_validate
 	
 	if [ "$primaryDBMD5" == "$secondDBMD5" ]
@@ -756,21 +755,18 @@ function md5_compare {
 	then
 		if [ -f ${PIHOLE_DIR}/${CUSTOM_DNS} ]
 		then
-			# MESSAGE="Comparing ${CUSTOM_DNS} Changes"
-			# echo_info
-			
 			if ${SSHPASSWORD} ${SSH_CMD} -p ${SSH_PORT} -i "$HOME/${SSH_PKIF}" ${REMOTE_USER}@${REMOTE_HOST} test -e ${PIHOLE_DIR}/${CUSTOM_DNS}
 			then
 				REMOTE_CUSTOM_DNS="1"
 				MESSAGE="Analyzing ${REMOTE_HOST} ${CUSTOM_DNS}"
 				echo_stat
 
-				primaryCLMD5=$(${SSHPASSWORD} ${SSH_CMD} -p ${SSH_PORT} -i "$HOME/${SSH_PKIF}" ${REMOTE_USER}@${REMOTE_HOST} "md5sum ${PIHOLE_DIR}/${CUSTOM_DNS}" >/dev/null 2>&1) 
+				primaryCLMD5=$(${SSHPASSWORD} ${SSH_CMD} -p ${SSH_PORT} -i "$HOME/${SSH_PKIF}" ${REMOTE_USER}@${REMOTE_HOST} "md5sum ${PIHOLE_DIR}/${CUSTOM_DNS} | sed 's/\s.*$//'") 
 					error_validate
 				
 				MESSAGE="Analyzing $HOSTNAME ${CUSTOM_DNS}"
 				echo_stat
-				secondCLMD5=$(md5sum ${PIHOLE_DIR}/${CUSTOM_DNS})
+				secondCLMD5=$(md5sum ${PIHOLE_DIR}/${CUSTOM_DNS} | sed 's/\s.*$//')
 					error_validate
 				
 				if [ "$primaryCLMD5" == "$secondCLMD5" ]