Merge branch 'dev' of https://github.com/rootzoll/raspiblitz into dev

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)

home.admin/00settingsMenuServices.sh

@@ -142,7 +142,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

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

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)

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

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