Cutlery/gravity-sync
1
0
Fork 0
mirror of https://github.com/vmstan/gravity-sync.git synced 2025-07-09 02:34:06 -04:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup analyzing output

Browse Source
This commit is contained in:
Michael Stanclift 2020-06-02 11:27:46 -05:00
parent 1a00f1e57c
commit 4f7987a372
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -19,6 +19,7 @@
- Adds time output to Aborting message (exit without change) - Adds time output to Aborting message (exit without change)
- Checks for existance of Pi-hole binaries during validation - Checks for existance of Pi-hole binaries during validation
- Less chatty about each step of configuration validation if it completes - Less chatty about each step of configuration validation if it completes
- Less chatty about replication validation if it's not necessary
#### 1.7.6 #### 1.7.6
- Detects `dbclient` install as alternative to OpenSSH Client. - Detects `dbclient` install as alternative to OpenSSH Client.

11
gravity-sync.sh
View File

@ -599,7 +599,7 @@ function validate_os_sshpass {
fi fi
MESSAGE="Validating SSH Connection to ${REMOTE_HOST}" MESSAGE="Validating Connection to ${REMOTE_HOST}"
echo_stat echo_stat
if hash ssh 2>/dev/null if hash ssh 2>/dev/null
then then
@ -612,7 +612,6 @@ function validate_os_sshpass {
fi fi
} }
## Detect SSH-KEYGEN ## Detect SSH-KEYGEN
function detect_sshkeygen { function detect_sshkeygen {
MESSAGE="Validating SSH-KEYGEN install on $HOSTNAME" MESSAGE="Validating SSH-KEYGEN install on $HOSTNAME"
@ -738,12 +737,12 @@ function error_validate {
function md5_compare { function md5_compare {
HASHMARK='0' HASHMARK='0'
MESSAGE="Analyzing ${REMOTE_HOST} ${GRAVITY_FI}" MESSAGE="Analyzing ${GRAVITY_FI} on ${REMOTE_HOST}"
echo_stat echo_stat
primaryDBMD5=$(${SSHPASSWORD} ${SSH_CMD} -p ${SSH_PORT} -i "$HOME/${SSH_PKIF}" ${REMOTE_USER}@${REMOTE_HOST} "md5sum ${PIHOLE_DIR}/${GRAVITY_FI}" | sed 's/\s.*$//') 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 error_validate
MESSAGE="Analyzing $HOSTNAME ${GRAVITY_FI}" MESSAGE="Analyzing ${GRAVITY_FI} on $HOSTNAME"
echo_stat echo_stat
secondDBMD5=$(md5sum ${PIHOLE_DIR}/${GRAVITY_FI} | sed 's/\s.*$//') secondDBMD5=$(md5sum ${PIHOLE_DIR}/${GRAVITY_FI} | sed 's/\s.*$//')
error_validate error_validate
@ -766,13 +765,13 @@ function md5_compare {
if ${SSHPASSWORD} ${SSH_CMD} -p ${SSH_PORT} -i "$HOME/${SSH_PKIF}" ${REMOTE_USER}@${REMOTE_HOST} test -e ${PIHOLE_DIR}/${CUSTOM_DNS} if ${SSHPASSWORD} ${SSH_CMD} -p ${SSH_PORT} -i "$HOME/${SSH_PKIF}" ${REMOTE_USER}@${REMOTE_HOST} test -e ${PIHOLE_DIR}/${CUSTOM_DNS}
then then
REMOTE_CUSTOM_DNS="1" REMOTE_CUSTOM_DNS="1"
MESSAGE="Analyzing ${REMOTE_HOST} ${CUSTOM_DNS}" MESSAGE="Analyzing ${CUSTOM_DNS} on ${REMOTE_HOST}"
echo_stat echo_stat
primaryCLMD5=$(${SSHPASSWORD} ${SSH_CMD} -p ${SSH_PORT} -i "$HOME/${SSH_PKIF}" ${REMOTE_USER}@${REMOTE_HOST} "md5sum ${PIHOLE_DIR}/${CUSTOM_DNS} | sed 's/\s.*$//'") 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 error_validate
MESSAGE="Analyzing $HOSTNAME ${CUSTOM_DNS}" MESSAGE="Analyzing ${CUSTOM_DNS} on $HOSTNAME"
echo_stat echo_stat
secondCLMD5=$(md5sum ${PIHOLE_DIR}/${CUSTOM_DNS} | sed 's/\s.*$//') secondCLMD5=$(md5sum ${PIHOLE_DIR}/${CUSTOM_DNS} | sed 's/\s.*$//')
error_validate error_validate