From 72859d6cb428a2e11faa8971cdd3fd0e6e24dc08 Mon Sep 17 00:00:00 2001 From: Sean Wheller Date: Sun, 11 Aug 2019 10:45:15 +0200 Subject: [PATCH] tweaks --- functions.sh | 2 +- input.sh | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/functions.sh b/functions.sh index f5da228..2978c2c 100755 --- a/functions.sh +++ b/functions.sh @@ -14,7 +14,7 @@ function prompt_confirm() { function show_mysettings () { if [ -f $_WORK_DIR/$_MYSETTINGS_FILE ]; then . $_MYSETTINGS_FILE - echo "${_GREEN}Settings from loaded from mysettings.sh.${_RESET}" + echo "${_CYAN}Settings from loaded from mysettings.sh.${_RESET}" echo "${_GREEN}Pool URL:${_RESET}: $_POOL_SERVER_URL" echo "${_GREEN}Pool Port:${_RESET}: $_POOL_SERVER_PORT" echo "${_GREEN}Recieve Wallet:${_RESET}: $_RECEIVE_WALLET" diff --git a/input.sh b/input.sh index 153baf7..47751a0 100755 --- a/input.sh +++ b/input.sh @@ -2,16 +2,14 @@ # Ask user questions # Capture input -. functions.sh -. settings.sh -echo -e "${_YELLOW}Choose to use default settings or enter your own.\n" +echo -e "${_YELLOW}Opt for default settings or enter your own.\n" -echo -e "Use defaults and values will be taken from 'settings.sh'." -echo -e "Enter your own and settings will persist to 'mysettings.sh'.\n" +echo -e "No - values taken from 'settings.sh'." +echo -e "Yes - values taken from 'mysettings.sh' (recomended).\n" -echo -e "Preference is given to settings in 'mysettings.sh'." -echo -e "When starting from 'start.sh' and 'mysettings.sh' exists it will be loaded instead of 'settings.sh'.${_RESET}\n" +echo -e "When 'mysettings.sh' they are given preference at installation and on subsequence restarts." +echo -e "Own settings is recomended to avoid your settings being overidden in upgrades.${_RESET}\n" if [ -f $_WORK_DIR/$_MYSETTINGS_FILE ]; then @@ -58,3 +56,5 @@ else fi fi + +echo -e "${_GREEN}MYSETTINGS LOADED${_RESET}"