b20afb3 · xmrig-bash-scripts

git.iko.soy/xmrig-bash-scripts

make input cleaner and clearer

commitb20afb3afe637647e8c53efad6b426b77e1e5e76 authorSean Wheller <sean@prepaidmeters.com> dateTue 13 Aug 2019, 17:33 (7 years ago) parent1411b20

2 files changed+15−32

compare with master

unifiedsplit

functions.sh+6−11 input.sh+9−21

functions.sh+6−11

@@ -15,23 +15,18 @@ function prompt_confirm() {

1515

1616function show_settings () {

1717 echo "${_CYAN}Settings from loaded environment:${_RESET}"

18− echo "${_GREEN}Pool URL:${_RESET}: $_POOL_SERVER_URL"

19− echo "${_GREEN}Pool Port:${_RESET}: $_POOL_SERVER_PORT"

20− echo "${_GREEN}Recieve Wallet:${_RESET}: $_RECEIVE_WALLET"

21− echo "${_GREEN}Email Address:${_RESET}: $_EMAIL"

22− echo "${_GREEN}Worker Identity:${_RESET}: $_API_WORKER_ID"

18+ echo "${_GREEN}Pool URL:${_RESET}: $_POOLS_URL"

19+ echo "${_GREEN}Recieve Wallet:${_RESET}: $_POOLS_USER"

20+ echo "${_GREEN}Email Address:${_RESET}: $_POOLS_PASS"

2321}

2422

2523function show_mysettings () {

2624 if [ -f $_WORK_DIR/$_MYSETTINGS_FILE ]; then

2725 load_mysettings

2826 echo "${_CYAN}Settings from mysettings.sh:${_RESET}"

29− echo "${_CYAN}Settings loaded:${_RESET}"

30− echo "${_GREEN}Pool URL:${_RESET}: $_POOL_SERVER_URL"

31− echo "${_GREEN}Pool Port:${_RESET}: $_POOL_SERVER_PORT"

32− echo "${_GREEN}Recieve Wallet:${_RESET}: $_RECEIVE_WALLET"

33− echo "${_GREEN}Email Address:${_RESET}: $_EMAIL"

34− echo "${_GREEN}Worker Identity:${_RESET}: $_API_WORKER_ID"

27+ echo "${_GREEN}Pool URL:${_RESET}: $_POOLS_URL"

28+ echo "${_GREEN}Recieve Wallet:${_RESET}: $_POOLS_USER"

29+ echo "${_GREEN}Email Address:${_RESET}: $_POOLS_PASS"

3530 fi

3631}

3732

input.sh+9−21

@@ -36,29 +36,17 @@ else

3636

3737 # Prompt user input

3838

39− echo "Current pool URL: $_POOL_SERVER_URL"

40− read -p "Enter new pool URL: " _POOL_SERVER_URL

39+ echo "Current pool URL: $_POOLS_URL"

40+ read -p "Enter new pool URL: " _POOLS_URL

41+ echo "_POOLS_URL=\"$_POOLS_URL\"" >> $_MYSETTINGS_FILE_LOCATION

4142

42− echo "Current pool TCP Port: $_POOL_SERVER_PORT"

43− read -p "Enter new pool TCP Port: " _POOL_SERVER_PORT

43+ echo "Current Receive Wallet address: $_POOLS_USER"

44+ read -p "Enter new Receive Wallet address: " _POOLS_USER

45+ echo "_POOLS_USER=\"$_POOLS_USER\"" >> $_MYSETTINGS_FILE_LOCATION

4446

45− echo "Current Receive Wallet address: $_RECEIVE_WALLET"

46− read -p "Enter new Receive Wallet address: " _RECEIVE_WALLET

47−

48− echo "Current email address: $_EMAIL"

49− read -p "Enter new email address: " _EMAIL

50−

51− echo "Current Miner Identifier: $_API_WORKER_ID"

52− read -p "Enter Miner Identifier: " _API_WORKER_ID

53−

54− # Write user input to file

55−

56− echo "_POOL_SERVER_URL=\"$_POOL_SERVER_URL\"" >> $_MYSETTINGS_FILE_LOCATION

57− echo "_POOL_SERVER_PORT=\"$_POOL_SERVER_PORT\"" >> $_MYSETTINGS_FILE_LOCATION

58− echo "_RECEIVE_WALLET=\"$_RECEIVE_WALLET\"" >> $_MYSETTINGS_FILE_LOCATION

59− echo "_EMAIL=\"$_EMAIL\"" >> $_MYSETTINGS_FILE_LOCATION

60− echo "_API_WORKER_ID=\"$_API_WORKER_ID\"" >> $_MYSETTINGS_FILE_LOCATION

61− echo "_POOLS_URL=\"$_POOL_SERVER_URL:$_POOL_SERVER_PORT\"" >> $_MYSETTINGS_FILE_LOCATION

47+ echo "Current email address: $_POOLS_PASS"

48+ read -p "Enter new email address: " _POOLS_PASS

49+ echo "_POOLS_PASS=\"$_POOLS_PASS\"" >> $_MYSETTINGS_FILE_LOCATION

6250

6351 fi

6452