From d3376947d5ba48a1bfa224fc8289509053a18672 Mon Sep 17 00:00:00 2001 From: Michael Stanclift Date: Fri, 22 May 2020 10:46:24 -0500 Subject: [PATCH] Import settings function --- gravity-sync.sh | 32 +++++++++++++++++--------------- 1 file changed, 17 insertions(+), 15 deletions(-) diff --git a/gravity-sync.sh b/gravity-sync.sh index 9924e98..b23633e 100755 --- a/gravity-sync.sh +++ b/gravity-sync.sh @@ -29,23 +29,23 @@ YELLOW='\033[0;93m' PURPLE='\033[0;95m' NC='\033[0m' -############################################## - -# IMPORT SETTINGS - -echo -e "${CYAN}Importing gravity-sync.conf settings${NC}" -if [ -f ~/${LOCAL_FOLDR}/gravity-sync.conf ] -then - source gravity-sync.conf - echo -e "${GREEN}Success${NC}: Configured for ${REMOTE_USER}@${REMOTE_HOST}" -else - echo -e "${RED}Failure${NC}: Required file gravity-sync.conf is missing!" - echo -e "Please review installation documentation for more information" - exit -fi - # FUNCTION DEFINITIONS ####################### +# Import Settings + +function import_gs { + echo -e "${CYAN}Importing gravity-sync.conf settings${NC}" + if [ -f ~/${LOCAL_FOLDR}/gravity-sync.conf ] + then + source gravity-sync.conf + echo -e "${GREEN}Success${NC}: Configured for ${REMOTE_USER}@${REMOTE_HOST}" + else + echo -e "${RED}Failure${NC}: Required file gravity-sync.conf is missing!" + echo -e "Please review installation documentation for more information" + exit + fi +} + # Update Function function update_gs { @@ -146,6 +146,8 @@ function validate_gs_arguments { # SCRIPT EXECUTION ########################### +import_gs + echo -e "${CYAN}Validating sync folder configuration${NC}" validate_gs_folders validate_ph_folders