Changing more headers

This commit is contained in:
Michael Stanclift 2020-05-24 19:38:43 -05:00
parent 9a5b9ef353
commit c26bbec364

View File

@ -51,14 +51,17 @@ INFO="[${YELLOW}INFO${NC}]"
# Import Settings # Import Settings
function import_gs { function import_gs {
echo -e "[${CYAN}STAT${NC}] Importing ${CONFIG_FILE} Settings" MESSAGE="Importing ${CONFIG_FILE} Settings"
echo -e "${STAT} $MESSAGE"
if [ -f $HOME/${LOCAL_FOLDR}/${CONFIG_FILE} ] if [ -f $HOME/${LOCAL_FOLDR}/${CONFIG_FILE} ]
then then
source $HOME/${LOCAL_FOLDR}/${CONFIG_FILE} source $HOME/${LOCAL_FOLDR}/${CONFIG_FILE}
echo -e "[${GREEN}GOOD${NC}] Using ${REMOTE_USER}@${REMOTE_HOST}" if_validate
MESSAGE="Using ${REMOTE_USER}@${REMOTE_HOST}"
echo -e "${INFO} ${MESSAGE}"
else else
echo -e "[${RED}FAIL${NC}] Required ${CONFIG_FILE} Missing" echo -e "[${RED}FAIL${NC}] Required ${CONFIG_FILE} Missing"
echo -e "Please review installation documentation for more information"
exit_nochange exit_nochange
fi fi
} }
@ -67,9 +70,12 @@ function import_gs {
function update_gs { function update_gs {
TASKTYPE='UPDATE' TASKTYPE='UPDATE'
logs_export # dumps log prior to execution because script stops after successful pull logs_export # dumps log prior to execution because script stops after successful pull
echo -e "[${PURPLE}WARN${NC}] Requires GitHub Installation"
MESSAGE="Requires GitHub Installation"
echo -e "${INFO} Requires GitHub Installation"
git reset --hard git reset --hard
git pull git pull
exit exit
} }
@ -77,6 +83,8 @@ function update_gs {
function pull_gs { function pull_gs {
TASKTYPE='PULL' TASKTYPE='PULL'
echo -e "${INFO} ${TASKTYPE} Requested"
MESSAGE="Pulling ${GRAVITY_FI} from ${REMOTE_HOST}" MESSAGE="Pulling ${GRAVITY_FI} from ${REMOTE_HOST}"
echo -e "${STAT} ${MESSAGE}" echo -e "${STAT} ${MESSAGE}"
rsync -v -e 'ssh -p 22' ${REMOTE_USER}@${REMOTE_HOST}:${PIHOLE_DIR}/${GRAVITY_FI} $HOME/${LOCAL_FOLDR}/${BACKUP_FOLD}/${GRAVITY_FI}.pull rsync -v -e 'ssh -p 22' ${REMOTE_USER}@${REMOTE_HOST}:${PIHOLE_DIR}/${GRAVITY_FI} $HOME/${LOCAL_FOLDR}/${BACKUP_FOLD}/${GRAVITY_FI}.pull
@ -198,32 +206,38 @@ function logs_export {
# Validate Functions # Validate Functions
## Validate GS Folders ## Validate GS Folders
function validate_gs_folders { function validate_gs_folders {
if [ -d $HOME/${LOCAL_FOLDR} ] MESSAGE="Locating $HOME/${LOCAL_FOLDR}"
then echo -e "${STAT} ${MESSAGE}"
echo -e "[${GREEN}GOOD${NC}] Required $HOME/${LOCAL_FOLDR} Located" if [ -d $HOME/${LOCAL_FOLDR} ]
else then
echo -e "[${RED}FAIL${NC}] Required $HOME/${LOCAL_FOLDR} Missing" echo -e "${GOOD} ${MESSAGE}"
exit_nochange else
fi echo -e "${FAIL} ${MESSAGE}"
exit_nochange
fi
if [ -d $HOME/${LOCAL_FOLDR}/${BACKUP_FOLD} ] MESSAGE="Locating $HOME/${LOCAL_FOLDR}/${BACKUP_FOLD}"
then echo -e "${STAT} ${MESSAGE}"
echo -e "[${GREEN}GOOD${NC}] Required $HOME/${LOCAL_FOLDR}/${BACKUP_FOLD} Located" if [ -d $HOME/${LOCAL_FOLDR}/${BACKUP_FOLD} ]
else then
echo -e "[${RED}FAIL${NC}] Required $HOME/${LOCAL_FOLDR}/${BACKUP_FOLD} Missing" echo -e "${GOOD} ${MESSAGE}"
exit_nochange else
fi echo -e "${FAIL} ${MESSAGE}"
exit_nochange
fi
} }
## Validate PH Folders ## Validate PH Folders
function validate_ph_folders { function validate_ph_folders {
if [ -d ${PIHOLE_DIR} ] MESSAGE="Locating ${PIHOLE_DIR}"
then echo -e "${STAT} ${MESSAGE}"
echo -e "[${GREEN}GOOD${NC}] Required ${PIHOLE_DIR} Located" if [ -d ${PIHOLE_DIR} ]
else then
echo -e "[${RED}FAIL${NC}] Required ${PIHOLE_DIR} Missing" echo -e "${GOOD} ${MESSAGE}"
exit_nochange else
fi echo -e "${FAIL} ${MESSAGE}"
exit_nochange
fi
} }
# List GS Arguments # List GS Arguments
@ -246,7 +260,7 @@ function list_gs_arguments {
# Exit Codes # Exit Codes
## No Changes Made ## No Changes Made
function exit_nochange { function exit_nochange {
echo -e "${INFO} ${PROGRAM} ${YELLOW}${TASKTYPE}${NC} Exiting Without Changes" echo -e "${INFO} ${PROGRAM} ${YELLOW}${TASKTYPE}${NC} Aborting"
exit 0 exit 0
} }
@ -290,11 +304,10 @@ case $# in
pull) pull)
echo -e "${GOOD} ${MESSAGE}" echo -e "${GOOD} ${MESSAGE}"
MESSAGE="Pull Requested" import_gs
echo -e "${STAT} ${MESSAGE}"
import_gs MESSAGE="Validating Folder Configuration"
echo -e "${INFO} ${MESSAGE}"
echo -e "[${CYAN}STAT${NC}] Validating Folder Configuration"
validate_gs_folders validate_gs_folders
validate_ph_folders validate_ph_folders
@ -303,10 +316,11 @@ case $# in
;; ;;
push) push)
echo -e "[${GREEN}GOOD${NC}] Push Requested" echo -e "${GOOD} ${MESSAGE}"
import_gs
import_gs
echo -e "[${CYAN}STAT${NC}] Validating Folder Configuration" echo -e "${INFO} Validating Folder Configuration"
validate_gs_folders validate_gs_folders
validate_ph_folders validate_ph_folders