git.iko.soy/xmrig-bash-scripts
on master help sign in
Merge branch 'release/v1.0.8'
commit7402175231b0ba25b7f47ce02523bbd87ef7b92e authorSean Wheller <sean@prepaidmeters.com> dateTue 13 Aug 2019, 18:14 (7 years ago) parentedc6f8de9cf118
8 files changed+31−45
compare with master
unifiedsplit
.gitignore+1 depends.sh+1−1 functions.sh+7−12 input.sh+9−21 install.sh+7−7 maintenance.sh+1−1 settings.sh+2−2 update.sh+3−1
.gitignore+1
@@ -1,6 +1,7 @@
11xmrig-cpu/
22*.swp
33crontab
4+null
45config.json
56myconfig.json
67mysettings.sh
depends.sh+1−1
@@ -4,7 +4,7 @@
44
55echo "${_GREEN}INSTALL DEPENDS STARTED${_RESET}"
66
7−if [ $_APT_DEPENDS = 1 ]; then
7+if [ "$_APT_DEPENDS" -eq "1" ]; then
88
99 # Install xmrig depends
1010 sudo apt install -y software-properties-common git build-essential cmake libuv1-dev libssl-dev libmicrohttpd-dev libhwloc-dev gcc g++
functions.sh+7−12
@@ -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
@@ -42,7 +37,7 @@ function load_mysettings () {
4237}
4338
4439function my_config_json () {
45− _CONFIG_JSON=$(jo -p -B api=$(jo id=$_API_ID worker-id=$_API_WORKER_ID) autosave=$_AUTOSAVE background=$_BACKGROUND colors=$_COLORS cpu=$(jo enabled=$_CPU_ENABLED huge-pages=$_CPU_HUGE_PAGES hw-aes=$_CPU_HW_AES priority=$_CPU_PRIORITY asm=$_CPU_ASM cn=$(jo -a $_CPU_CN) cn/0=$_CPU_CN_0 cn-lite/0=$_CPU_CN_LITE_0) donate-level=$_DONATE_LEVEL donate-over-proxy=$_DONATE_OVER_PROXY http=$(jo enabled=$_HTTP_ENABLED host=$_HTTP_HOST port=$_HTTP_PORT access-token=$_HTTP_ACCESS_TOKEN restricted=$_HTTP_RESTRICTED) logfile=$_LOGFILE pools=$(jo -a $(jo algo=$_POOLS_ALGO url=$_POOLS_URL user=$_POOLS_USER pass=$_POOLS_PASS rig-id=$_POOLS_RIG_ID nicehash=$_POOLS_NICEHASH keepalive=$_POOLS_KEEPALIVE enabled=$_POOLS_ENABLED tls=$_POOLS_TLS tls-fingerprint=$_POOLS_TLS_FINDERPRINT daemon=$_POOLS_DAEMON)) print-time=$_PRINT_TIME retries=$_RETRIES retry-pause=$_RETRIES_PAUSE syslog=$_SYSLOG user-agent=$_USER_AGENT watch=$_WATCH)
40+ _CONFIG_JSON=$(jo -p -B api=$(jo id=$_API_ID worker-id=$_API_WORKER_ID) autosave=$_AUTOSAVE background=$_BACKGROUND colors=$_COLORS cpu=$(jo enabled=$_CPU_ENABLED huge-pages=$_CPU_HUGE_PAGES hw-aes=$_CPU_HW_AES priority=$_CPU_PRIORITY asm=$_CPU_ASM cn=$(jo -a $_CPU_CN) cn/0=$_CPU_CN_0 cn-lite/0=$_CPU_CN_LITE_0) donate-level=$_DONATE_LEVEL donate-over-proxy=$_DONATE_OVER_PROXY http=$(jo enabled=$_HTTP_ENABLED host=$_HTTP_HOST port=$_HTTP_PORT access-token=$_HTTP_ACCESS_TOKEN restricted=$_HTTP_RESTRICTED) log-file=$_LOG_FILE pools=$(jo -a $(jo algo=$_POOLS_ALGO url=$_POOLS_URL user=$_POOLS_USER pass=$_POOLS_PASS rig-id=$_POOLS_RIG_ID nicehash=$_POOLS_NICEHASH keepalive=$_POOLS_KEEPALIVE enabled=$_POOLS_ENABLED tls=$_POOLS_TLS tls-fingerprint=$_POOLS_TLS_FINDERPRINT daemon=$_POOLS_DAEMON)) print-time=$_PRINT_TIME retries=$_RETRIES retry-pause=$_RETRIES_PAUSE syslog=$_SYSLOG user-agent=$_USER_AGENT watch=$_WATCH)
4641}
4742
4843function build_xmrig () {
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
install.sh+7−7
@@ -36,13 +36,6 @@ sleep 5
3636. settings.sh
3737sleep 5
3838
39−# User input
40−. input.sh
41−sleep 5
42−
43−# Stop running instance
44−. stop.sh
45−
4639# Update system
4740. maintenance.sh
4841sleep 5
@@ -51,6 +44,13 @@ sleep 5
5144. depends.sh
5245sleep 5
5346
47+# User input
48+. input.sh
49+sleep 5
50+
51+# Stop running instance
52+. stop.sh
53+
5454# Get source and build by sourcing our build file
5555. build.sh
5656sleep 5
maintenance.sh+1−1
@@ -2,7 +2,7 @@
22
33echo "${_GREEN}MAINTENANCE STARTED${_RESET}"
44
5−if [ $_APT_MAINETANCE = 1 ]; then
5+if [ "$_APT_MAINETANCE" -eq "1" ]; then
66
77 sudo apt update && sudo apt upgrade -y && sudo apt autoremove -y && sudo apt autoclean
88
settings.sh+2−2
@@ -114,8 +114,8 @@ _XMRIG_CONFIG="config.json"
114114_XMRIG_CONFIG_LOCATION="$_WORK_DIR/$_XMRIG_CONFIG"
115115
116116# Set values for crontab
117−_USER_CRONSTART="18"
118−_USER_CRONSTOP="6"
117+_USER_CRONSTART="17"
118+_USER_CRONSTOP="8"
119119_USER_CRONDAYS="1-5"
120120
121121# Set the name of the screen created by start script
update.sh+3−1
@@ -1,9 +1,11 @@
11#!/bin/bash
22
3+echo "${_GREEN}UPDATE STARTED${_RESET}"
4+
35git pull
46
57# install
68. install.sh
79sleep 5
810
9−echo "${_GREEN}UPDATE COMPLETE${_RESET}"
11+echo "${_CYAN}UPDATE COMPLETE${_RESET}"