git.iko.soy/xmrig-bash-scripts
on master help sign in
Merge branch 'release/v1.0.8'
7402175Sean Wheller
.gitignore+1
@@ -1,6 +1,7 @@
1xmrig-cpu/
1xmrig-cpu/
2*.swp
2*.swp
3crontab
3crontab
4+null
4config.json
5config.json
5myconfig.json
6myconfig.json
6mysettings.sh
7mysettings.sh
depends.sh+1−1
@@ -4,7 +4,7 @@
4
4
5echo "${_GREEN}INSTALL DEPENDS STARTED${_RESET}"
5echo "${_GREEN}INSTALL DEPENDS STARTED${_RESET}"
6
6
7−if [ $_APT_DEPENDS = 1 ]; then
7+if [ "$_APT_DEPENDS" -eq "1" ]; then
8
8
9 # Install xmrig depends
9 # Install xmrig depends
10 sudo apt install -y software-properties-common git build-essential cmake libuv1-dev libssl-dev libmicrohttpd-dev libhwloc-dev gcc g++
10 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() {
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
@@ -42,7 +37,7 @@ function load_mysettings () {
42}
37}
43
38
44function my_config_json () {
39function 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)
46}
41}
47
42
48function build_xmrig () {
43function build_xmrig () {
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
install.sh+7−7
@@ -36,13 +36,6 @@ sleep 5
36. settings.sh
36. settings.sh
37sleep 5
37sleep 5
38
38
39−# User input
40−. input.sh
41−sleep 5
42−
43−# Stop running instance
44−. stop.sh
45−
46# Update system
39# Update system
47. maintenance.sh
40. maintenance.sh
48sleep 5
41sleep 5
@@ -51,6 +44,13 @@ sleep 5
51. depends.sh
44. depends.sh
52sleep 5
45sleep 5
53
46
47+# User input
48+. input.sh
49+sleep 5
50+
51+# Stop running instance
52+. stop.sh
53+
54# Get source and build by sourcing our build file
54# Get source and build by sourcing our build file
55. build.sh
55. build.sh
56sleep 5
56sleep 5
maintenance.sh+1−1
@@ -2,7 +2,7 @@
2
2
3echo "${_GREEN}MAINTENANCE STARTED${_RESET}"
3echo "${_GREEN}MAINTENANCE STARTED${_RESET}"
4
4
5−if [ $_APT_MAINETANCE = 1 ]; then
5+if [ "$_APT_MAINETANCE" -eq "1" ]; then
6
6
7 sudo apt update && sudo apt upgrade -y && sudo apt autoremove -y && sudo apt autoclean
7 sudo apt update && sudo apt upgrade -y && sudo apt autoremove -y && sudo apt autoclean
8
8
settings.sh+2−2
@@ -114,8 +114,8 @@ _XMRIG_CONFIG="config.json"
114_XMRIG_CONFIG_LOCATION="$_WORK_DIR/$_XMRIG_CONFIG"
114_XMRIG_CONFIG_LOCATION="$_WORK_DIR/$_XMRIG_CONFIG"
115
115
116# Set values for crontab
116# Set values for crontab
117−_USER_CRONSTART="18"
117+_USER_CRONSTART="17"
118−_USER_CRONSTOP="6"
118+_USER_CRONSTOP="8"
119_USER_CRONDAYS="1-5"
119_USER_CRONDAYS="1-5"
120
120
121# Set the name of the screen created by start script
121# Set the name of the screen created by start script
update.sh+3−1
@@ -1,9 +1,11 @@
1#!/bin/bash
1#!/bin/bash
2
2
3+echo "${_GREEN}UPDATE STARTED${_RESET}"
4+
3git pull
5git pull
4
6
5# install
7# install
6. install.sh
8. install.sh
7sleep 5
9sleep 5
8
10
9−echo "${_GREEN}UPDATE COMPLETE${_RESET}"
11+echo "${_CYAN}UPDATE COMPLETE${_RESET}"