git.iko.soy/xmrig-bash-scripts
on master help sign in
make input cleaner and clearer
b20afb3Sean Wheller
functions.sh+6−11
compare with master
unifiedsplit
@@ -15,23 +15,18 @@ function prompt_confirm() {
15
15
16function show_settings () {
16function show_settings () {
17 echo "${_CYAN}Settings from loaded environment:${_RESET}"
17 echo "${_CYAN}Settings from loaded environment:${_RESET}"
18− echo "${_GREEN}Pool URL:${_RESET}: $_POOL_SERVER_URL"
18+ echo "${_GREEN}Pool URL:${_RESET}: $_POOLS_URL"
19− echo "${_GREEN}Pool Port:${_RESET}: $_POOL_SERVER_PORT"
20− echo "${_GREEN}Recieve Wallet:${_RESET}: $_RECEIVE_WALLET"
19+ echo "${_GREEN}Recieve Wallet:${_RESET}: $_POOLS_USER"
21− echo "${_GREEN}Email Address:${_RESET}: $_EMAIL"
20+ echo "${_GREEN}Email Address:${_RESET}: $_POOLS_PASS"
22− echo "${_GREEN}Worker Identity:${_RESET}: $_API_WORKER_ID"
23}
21}
24
22
25function show_mysettings () {
23function show_mysettings () {
26 if [ -f $_WORK_DIR/$_MYSETTINGS_FILE ]; then
24 if [ -f $_WORK_DIR/$_MYSETTINGS_FILE ]; then
27 load_mysettings
25 load_mysettings
28 echo "${_CYAN}Settings from mysettings.sh:${_RESET}"
26 echo "${_CYAN}Settings from mysettings.sh:${_RESET}"
29− echo "${_CYAN}Settings loaded:${_RESET}"
30− echo "${_GREEN}Pool URL:${_RESET}: $_POOL_SERVER_URL"
27+ echo "${_GREEN}Pool URL:${_RESET}: $_POOLS_URL"
31− echo "${_GREEN}Pool Port:${_RESET}: $_POOL_SERVER_PORT"
32− echo "${_GREEN}Recieve Wallet:${_RESET}: $_RECEIVE_WALLET"
28+ echo "${_GREEN}Recieve Wallet:${_RESET}: $_POOLS_USER"
33− echo "${_GREEN}Email Address:${_RESET}: $_EMAIL"
29+ echo "${_GREEN}Email Address:${_RESET}: $_POOLS_PASS"
34− echo "${_GREEN}Worker Identity:${_RESET}: $_API_WORKER_ID"
35 fi
30 fi
36}
31}
37
32
input.sh+9−21
@@ -36,29 +36,17 @@ else
36
36
37 # Prompt user input
37 # Prompt user input
38
38
39− echo "Current pool URL: $_POOL_SERVER_URL"
39+ echo "Current pool URL: $_POOLS_URL"
40− read -p "Enter new pool URL: " _POOL_SERVER_URL
40+ read -p "Enter new pool URL: " _POOLS_URL
41+ echo "_POOLS_URL=\"$_POOLS_URL\"" >> $_MYSETTINGS_FILE_LOCATION
41
42
42− echo "Current pool TCP Port: $_POOL_SERVER_PORT"
43+ echo "Current Receive Wallet address: $_POOLS_USER"
43− read -p "Enter new pool TCP Port: " _POOL_SERVER_PORT
44+ read -p "Enter new Receive Wallet address: " _POOLS_USER
45+ echo "_POOLS_USER=\"$_POOLS_USER\"" >> $_MYSETTINGS_FILE_LOCATION
44
46
45− echo "Current Receive Wallet address: $_RECEIVE_WALLET"
47+ echo "Current email address: $_POOLS_PASS"
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
48+ read -p "Enter new email address: " _POOLS_PASS
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
49+ echo "_POOLS_PASS=\"$_POOLS_PASS\"" >> $_MYSETTINGS_FILE_LOCATION
62
50
63 fi
51 fi
64
52