diff --git a/CHANGES.md b/CHANGES.md index 61eed9a42..667c4c50b 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -5,8 +5,14 @@ - Update: Raspberry Pi OS Base Image 64-bit (August 2020) - Update: bitcoin-core version 0.21.0-beta [details](https://github.com/bitcoin/bitcoin/blob/master/doc/release-notes/release-notes-0.21.0.md) - Update: LND version 0.12.1-beta [details](https://github.com/lightningnetwork/lnd/releases/tag/v0.12.1-beta) +- Update: Thunderhub 0.12.7 [details](https://github.com/apotdevin/thunderhub/blob/master/CHANGELOG.md#0124-2021-01-09) +- Update: Electrs 0.8.8 [details](https://github.com/romanz/electrs/blob/master/RELEASE-NOTES.md#088-22-feb-2021) +- Update: BTCPayServer 1.0.7.0 [details](https://github.com/btcpayserver/btcpayserver/releases/tag/v1.0.7.0) +- Update: Specter Desktop 1.2.2 [details](https://github.com/cryptoadvance/specter-desktop/blob/master/README.md) +- Update: Balance of Satoshis 8.0.2 (BOS) [details](https://github.com/alexbosworth/balanceofsatoshis/blob/master/CHANGELOG.md#version-802) - Update: Faraday 0.2.3-alpha [details](https://github.com/lightninglabs/faraday/releases/tag/v0.2.3-alpha) -- Update: electrs 0.8.8 [details](https://github.com/romanz/electrs/blob/master/RELEASE-NOTES.md#088-22-feb-2021) +- Update: JoinMarket 0.8.2 [details](https://github.com/JoinMarket-Org/joinmarket-clientserver/releases/tag/v0.8.2) +- Update: JoininBox 0.3.2 [details](https://github.com/openoms/joininbox/releases/tag/v0.3.2) - New: Build SD card Image with parameters & FatPack [details](https://github.com/rootzoll/raspiblitz/pull/2044) ## Whats new in Version 1.6.3 of RaspiBlitz? diff --git a/home.admin/_commands.sh b/home.admin/_commands.sh index c6a708a90..4f317d986 100755 --- a/home.admin/_commands.sh +++ b/home.admin/_commands.sh @@ -142,7 +142,10 @@ function fwdreport() { function bos() { if [ $(grep -c "bos=on" < /mnt/hdd/raspiblitz.conf) -eq 1 ]; then echo "# switching to the bos user with the command: 'sudo su - bos'" + echo "# use command 'exit' and then 'raspiblitz' to return to menu" + echo "# use command 'bos --help' to list all possible options" sudo su - bos + echo "# use command 'raspiblitz' to return to menu" else echo "Balance of Satoshis is not installed - to install run:" echo "/home/admin/config.scripts/bonus.bos.sh on" @@ -154,7 +157,10 @@ function bos() { function pyblock() { if [ $(grep -c "pyblock=on" < /mnt/hdd/raspiblitz.conf) -eq 1 ]; then echo "# switching to the pyblock user with the command: 'sudo su - pyblock'" + echo "# use command 'exit' and then 'raspiblitz' to return to menu" + echo "# use command 'pyblock' again to start" sudo su - pyblock + echo "# use command 'raspiblitz' to return to menu" else echo "PyBlock is not installed - to install run:" echo "/home/admin/config.scripts/bonus.pyblock.sh on" @@ -182,6 +188,7 @@ function faraday() { echo "# use command 'exit' and then 'raspiblitz' to return to menu" echo "# use command 'frcli --help' now to get more info" sudo su - faraday + echo "# use command 'raspiblitz' to return to menu" else echo "Faraday is not installed - to install run:" echo "/home/admin/config.scripts/bonus.faraday.sh on" @@ -196,6 +203,7 @@ function loop() { echo "# use command 'exit' and then 'raspiblitz' to return to menu" echo "# use command 'loop --help' now to get more info" sudo su - loop + echo "# use command 'raspiblitz' to return to menu" else echo "Lightning Loop is not installed - to install run:" echo "/home/admin/config.scripts/bonus.loop.sh on" @@ -210,6 +218,7 @@ function pool() { echo "# use command 'exit' and then 'raspiblitz' to return to menu" echo "# use command 'pool --help' now to get more info" sudo su - pool + echo "# use command 'raspiblitz' to return to menu" else echo "Pool is not installed - to install run:" echo "/home/admin/config.scripts/bonus.pool.sh on" diff --git a/home.admin/config.scripts/blitz.subscriptions.ip2tor.py b/home.admin/config.scripts/blitz.subscriptions.ip2tor.py index 42311f9b2..e37c694f4 100755 --- a/home.admin/config.scripts/blitz.subscriptions.ip2tor.py +++ b/home.admin/config.scripts/blitz.subscriptions.ip2tor.py @@ -12,7 +12,11 @@ from pathlib import Path import grpc import requests import toml -from blitzpy import RaspiBlitzConfig, BlitzError + +sys.path.append('/home/admin/raspiblitz/home.admin/BlitzPy/blitzpy') +from config import RaspiBlitzConfig +from exceptions import BlitzError + from lndlibs import rpc_pb2 as lnrpc from lndlibs import rpc_pb2_grpc as rpcstub diff --git a/home.admin/config.scripts/blitz.subscriptions.letsencrypt.py b/home.admin/config.scripts/blitz.subscriptions.letsencrypt.py index d5c8b13ee..b54f207d9 100755 --- a/home.admin/config.scripts/blitz.subscriptions.letsencrypt.py +++ b/home.admin/config.scripts/blitz.subscriptions.letsencrypt.py @@ -11,7 +11,10 @@ from pathlib import Path import requests import toml -from blitzpy import RaspiBlitzConfig,BlitzError + +sys.path.append('/home/admin/raspiblitz/home.admin/BlitzPy/blitzpy') +from config import RaspiBlitzConfig +from exceptions import BlitzError ##################### # SCRIPT INFO diff --git a/home.admin/config.scripts/blitz.subscriptions.py b/home.admin/config.scripts/blitz.subscriptions.py index 137425275..38d336526 100755 --- a/home.admin/config.scripts/blitz.subscriptions.py +++ b/home.admin/config.scripts/blitz.subscriptions.py @@ -11,7 +11,8 @@ import time from datetime import datetime import toml -from blitzpy import RaspiBlitzConfig +sys.path.append('/home/admin/raspiblitz/home.admin/BlitzPy/blitzpy') +from config import RaspiBlitzConfig from dialog import Dialog # constants for standard services diff --git a/home.admin/config.scripts/bonus.bos.sh b/home.admin/config.scripts/bonus.bos.sh index 5bf8baff4..74f139976 100755 --- a/home.admin/config.scripts/bonus.bos.sh +++ b/home.admin/config.scripts/bonus.bos.sh @@ -1,7 +1,7 @@ #!/bin/bash https://github.com/alexbosworth/balanceofsatoshis/blob/ba7c35b42f1bad0dbb0c9c03d64ee34472665029/package.json#L79 -BOSVERSION="8.0.0" +BOSVERSION="8.0.2" # command info if [ $# -eq 0 ] || [ "$1" = "-h" ] || [ "$1" = "-help" ]; then diff --git a/home.admin/config.scripts/bonus.joinmarket.sh b/home.admin/config.scripts/bonus.joinmarket.sh index 63a1cd460..cce5ff703 100755 --- a/home.admin/config.scripts/bonus.joinmarket.sh +++ b/home.admin/config.scripts/bonus.joinmarket.sh @@ -32,10 +32,11 @@ fi # show info menu if [ "$1" = "menu" ]; then whiptail --title " JoinMarket info " --msgbox " -Type: 'jm' in the command line to switch to the dedicated user and start the JoininBox menu. -Notes on usage: +Type: 'jm' in the command line to switch to the dedicated user +and start the JoininBox menu. Notes on usage: https://github.com/openoms/bitcoin-tutorials/blob/master/joinmarket/README.md -Can log in directly with the 'joinmarket' user via ssh. + +You can log in directly with the 'joinmarket' user via ssh. The user password is the PASSWORD_B. " 13 81 exit 0 diff --git a/home.admin/config.scripts/internet.hiddenservice.sh b/home.admin/config.scripts/internet.hiddenservice.sh index 67cab3e5e..e4ac7fc86 100755 --- a/home.admin/config.scripts/internet.hiddenservice.sh +++ b/home.admin/config.scripts/internet.hiddenservice.sh @@ -28,6 +28,7 @@ if [ "$1" == "off" ]; then # remove double empty lines sudo cp /etc/tor/torrc /mnt/hdd/temp/tmp sudo chmod 777 /mnt/hdd/temp/tmp + sudo chown admin:admin /mnt/hdd/temp/tmp sudo awk 'NF > 0 {blank=0} NF == 0 {blank++} blank < 2' /etc/tor/torrc > /mnt/hdd/temp/tmp sudo mv /mnt/hdd/temp/tmp /etc/tor/torrc sudo chmod 644 /etc/tor/torrc