Mirrored_Repos/gravity-sync
1
0
Fork 0
mirror of https://github.com/vmstan/gravity-sync.git synced 2024-08-30 18:22:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Slightly less verbose

Browse Source
This commit is contained in:
Michael Stanclift 2020-05-30 22:06:31 -05:00
parent b70aa3ad3d
commit a9975d0630
1 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
gravity-sync.sh
View File

@ -559,8 +559,8 @@ function validate_ph_folders {
## Validate SSHPASS ## Validate SSHPASS
function validate_os_sshpass { function validate_os_sshpass {
MESSAGE="Checking SSH Configuration" # MESSAGE="Checking SSH Configuration"
echo_info # echo_info
if hash sshpass 2>/dev/null if hash sshpass 2>/dev/null
then then
@ -701,8 +701,8 @@ function error_validate {
## Validate Sync Required ## Validate Sync Required
function md5_compare { function md5_compare {
MESSAGE="Comparing ${GRAVITY_FI} Changes" # MESSAGE="Comparing ${GRAVITY_FI} Changes"
echo_info # echo_info
HASHMARK='0' HASHMARK='0'
@ -731,8 +731,8 @@ function md5_compare {
then then
if [ -f ${PIHOLE_DIR}/${CUSTOM_DNS} ] if [ -f ${PIHOLE_DIR}/${CUSTOM_DNS} ]
then then
MESSAGE="Comparing ${CUSTOM_DNS} Changes" # MESSAGE="Comparing ${CUSTOM_DNS} Changes"
echo_info # echo_info
if ${SSHPASSWORD} ssh -p ${SSH_PORT} -i "$HOME/${SSH_PKIF}" ${REMOTE_USER}@${REMOTE_HOST} test -e ${PIHOLE_DIR}/${CUSTOM_DNS} if ${SSHPASSWORD} ssh -p ${SSH_PORT} -i "$HOME/${SSH_PKIF}" ${REMOTE_USER}@${REMOTE_HOST} test -e ${PIHOLE_DIR}/${CUSTOM_DNS}
then then
@ -770,7 +770,7 @@ function md5_compare {
if [ "$HASHMARK" != "0" ] if [ "$HASHMARK" != "0" ]
then then
MESSAGE="Replication Suggested" MESSAGE="${YELLOW}Replication Required${NC}"
echo_info echo_info
HASHMARK=$((HASHMARK+0)) HASHMARK=$((HASHMARK+0))
else else
@ -1126,7 +1126,10 @@ function echo_need {
# SCRIPT EXECUTION ########################### # SCRIPT EXECUTION ###########################
SCRIPT_START=$SECONDS SCRIPT_START=$SECONDS
MESSAGE="Evaluating Script Arguments" MESSAGE="${PROGRAM} Starting"
echo_info
MESSAGE="Evaluating Arguments"
echo_stat echo_stat
case $# in case $# in
@ -1147,8 +1150,8 @@ case $# in
import_gs import_gs
MESSAGE="Validating Folder Configuration" # MESSAGE="Validating Folder Configuration"
echo_info # echo_info
validate_gs_folders validate_gs_folders
validate_ph_folders validate_ph_folders
validate_os_sshpass validate_os_sshpass
@ -1166,8 +1169,8 @@ case $# in
import_gs import_gs
MESSAGE="Validating Folder Configuration" # MESSAGE="Validating Folder Configuration"
echo_info # echo_info
validate_gs_folders validate_gs_folders
validate_ph_folders validate_ph_folders
validate_os_sshpass validate_os_sshpass