From 7eb751bbe90bd8c921eaeabaf87791d98683d92f Mon Sep 17 00:00:00 2001 From: Mike Qian Date: Sat, 4 Sep 2021 16:45:05 +0000 Subject: [PATCH 1/5] Fix typo in systemctl command --- home.admin/00settingsMenuServices.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home.admin/00settingsMenuServices.sh b/home.admin/00settingsMenuServices.sh index 899ae2fa6..75a199e15 100755 --- a/home.admin/00settingsMenuServices.sh +++ b/home.admin/00settingsMenuServices.sh @@ -99,7 +99,7 @@ if [ "${BTCRPCexplorer}" != "${choice}" ]; then errorOnInstall=$? if [ "${choice}" = "on" ]; then if [ ${errorOnInstall} -eq 0 ]; then - sudo sytemctl start btc-rpc-explorer + sudo systemctl start btc-rpc-explorer whiptail --title " Installed BTC-RPC-Explorer " --msgbox "\ The txindex may need to be created before BTC-RPC-Explorer can be active.\n This can take ~7 hours on a RPi4 with SSD. Monitor the progress on the LCD.\n From ac65ee3339d2ddd6044a8eae2bba86ba4e1fee8d Mon Sep 17 00:00:00 2001 From: openoms Date: Mon, 6 Sep 2021 14:50:20 +0100 Subject: [PATCH 2/5] blitz.statusscan: use LNTYPE from raspiblitz.conf --- home.admin/config.scripts/blitz.statusscan.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home.admin/config.scripts/blitz.statusscan.sh b/home.admin/config.scripts/blitz.statusscan.sh index a75af417f..268b5843e 100755 --- a/home.admin/config.scripts/blitz.statusscan.sh +++ b/home.admin/config.scripts/blitz.statusscan.sh @@ -7,7 +7,7 @@ source /mnt/hdd/raspiblitz.conf 2>/dev/null if [ $# -gt 0 ];then LNTYPE=$1 else - LNTYPE=lnd + LNTYPE=${lightning} fi source <(/home/admin/config.scripts/network.aliases.sh getvars $LNTYPE ${chain}net) From 02f8574641c65d2ad530c6d593e467885aeea89e Mon Sep 17 00:00:00 2001 From: openoms Date: Mon, 6 Sep 2021 14:52:04 +0100 Subject: [PATCH 3/5] RTL update to v0.11.2 --- CHANGES.md | 5 ++--- home.admin/config.scripts/bonus.rtl.sh | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 16f22cff2..7a455fc7e 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -7,9 +7,9 @@ - New: CLN plugin: Sparko [details](https://github.com/fiatjaf/sparko) - New: Suez - channel visualization for LND and CLN [details](https://github.com/prusnak/suez) -- Update: Bitcoin Vore v0.21.1 [details](https://github.com/bitcoin/bitcoin/blob/master/doc/release-notes/release-notes-0.21.1.md) +- Update: Bitcoin Core v0.21.1 [details](https://github.com/bitcoin/bitcoin/blob/master/doc/release-notes/release-notes-0.21.1.md) - Update: LND v0.13.1 [details](https://github.com/lightningnetwork/lnd/releases/tag/v0.13.1-beta) -- Update: RTL 0.11.1 [details](https://github.com/Ride-The-Lightning/RTL/releases/tag/v0.11.1) +- Update: RTL 0.11.2 [details](https://github.com/Ride-The-Lightning/RTL/releases/tag/v0.11.2) - Update: Specter Desktop 1.6.0 [details](https://github.com/cryptoadvance/specter-desktop/blob/master/README.md) - Update: Lightning Terminal v0.5.0-alpha [details](https://github.com/lightninglabs/lightning-terminal/releases/tag/v0.5.0-alpha) - Update: Pool CLI v0.5.1-alpha [details](https://github.com/lightninglabs/pool/releases/tag/v0.5.1-alpha) @@ -21,7 +21,6 @@ - Update: BTC-RPC-Explorer v3.2.0 [details](https://github.com/janoside/btc-rpc-explorer/blob/master/CHANGELOG.md#v320) - Update: stacking-sats-kraken 0.4.4 [details](https://github.com/dennisreimann/stacking-sats-kraken/blob/master/README.md) - ## What's new in Version 1.7.0 of RaspiBlitz? - New: Raspberry Pi OS Base Image 64-bit (April 2021) diff --git a/home.admin/config.scripts/bonus.rtl.sh b/home.admin/config.scripts/bonus.rtl.sh index dd73641d9..b96e69ea2 100755 --- a/home.admin/config.scripts/bonus.rtl.sh +++ b/home.admin/config.scripts/bonus.rtl.sh @@ -1,5 +1,5 @@ #!/bin/bash -RTLVERSION="v0.11.1" +RTLVERSION="v0.11.2" # check and load raspiblitz config # to know which network is running From 8323399f859d467904adc341bc88d7ab18d1f706 Mon Sep 17 00:00:00 2001 From: openoms Date: Mon, 6 Sep 2021 14:52:33 +0100 Subject: [PATCH 4/5] bonus.nodejs: npm update to v7 --- home.admin/config.scripts/bonus.nodejs.sh | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/home.admin/config.scripts/bonus.nodejs.sh b/home.admin/config.scripts/bonus.nodejs.sh index 303d8bf8e..0ff2e061d 100755 --- a/home.admin/config.scripts/bonus.nodejs.sh +++ b/home.admin/config.scripts/bonus.nodejs.sh @@ -1,5 +1,8 @@ #!/bin/bash +# consider installing with apt when updated next +# https://github.com/nodesource/distributions/blob/master/README.md#installation-instructions + VERSION="v14.17.6" # get checksums from -> https://nodejs.org/dist/vx.y.z/SHASUMS256.txt (tar.xs files) CHECKSUM_linux_arm64="9c4f3a651e03cd9b5bddd33a80e8be6a6eb15e518513e410bb0852a658699156" @@ -87,6 +90,15 @@ if [ "$1" = "1" ] || [ "$1" = "on" ]; then exit 1 fi fi + + npm7installed=$(npm -v 2>/dev/null | grep -c "7.") + if ! [ ${npm7installed} -eq 0 ]; then + # needed for RTL + # https://github.blog/2021-02-02-npm-7-is-now-generally-available/ + echo "# Update npm to v7" + sudo npm install --global npm@7 + fi + echo "Installed nodeJS $(node -v)" exit 0 fi From 1afd0a040cdd7c19b83ed5e45b360405ced90309 Mon Sep 17 00:00:00 2001 From: openoms Date: Mon, 6 Sep 2021 14:57:05 +0100 Subject: [PATCH 5/5] bootstrap.sh typo fixes --- home.admin/_bootstrap.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/home.admin/_bootstrap.sh b/home.admin/_bootstrap.sh index a027e7ee8..13881b64b 100755 --- a/home.admin/_bootstrap.sh +++ b/home.admin/_bootstrap.sh @@ -538,7 +538,7 @@ if [ ${isMounted} -eq 0 ]; then errorState=$? if [ "$errorState" != "0" ]; then echo "EXIT _provision.setup.sh BECAUSE OF ERROR STATE ($errorState)" >> $logFile - echo "This can also happen if _provision.setup.sh has syntax errros" >> $logFile + echo "This can also happen if _provision.setup.sh has syntax errors" >> $logFile sed -i "s/^state=.*/state='error'/g" ${infoFile} sed -i "s/^message=.*/message='_provision.setup.sh fail'/g" ${infoFile} exit 1 @@ -568,7 +568,7 @@ if [ ${isMounted} -eq 0 ]; then errorState=$? if [ "$errorState" != "0" ]; then echo "EXIT _provision.update.sh BECAUSE OF ERROR STATE ($errorState)" >> $logFile - echo "This can also happen if _provision.update.sh has syntax errros" >> $logFile + echo "This can also happen if _provision.update.sh has syntax errors" >> $logFile sed -i "s/^state=.*/state='error'/g" ${infoFile} sed -i "s/^message=.*/message='_provision.update.sh fail'/g" ${infoFile} exit 1 @@ -582,7 +582,7 @@ if [ ${isMounted} -eq 0 ]; then errorState=$? if [ "$errorState" != "0" ]; then echo "EXIT _provision_.sh BECAUSE OF ERROR STATE ($errorState)" >> $logFile - echo "This can also happen if _provision_.sh has syntax errros" >> $logFile + echo "This can also happen if _provision_.sh has syntax errors" >> $logFile sed -i "s/^state=.*/state='error'/g" ${infoFile} sed -i "s/^message=.*/message='_provision_.sh fail'/g" ${infoFile} exit 1