Merge branch 'master' into v1.6

FAQ.md

@@ -26,6 +26,11 @@
 - Fix: DropBox StaticChannelBackup
 - Shoppinglist: 4GB RaspberryPi 4 is now default for Standard Package (will still run with less) 
 
+## Whats new in Version 1.5.1 of RaspiBlitz?
+
+- Bugfix: DropBox Backup of Static-Channel-Backup
+- Bugfix: Torrentfiles with active tracker 
+
 ## Whats new in Version 1.5 of RaspiBlitz?
 
 Beside many small improvements and changes, these are most important changes:
@@ -813,8 +818,8 @@ If you want to use the HDMI output you can place a file called `hdmi` on the `bo
 
 If you are already logged in you can use on the console the commands:
 
-- `hdmi` --> to witch to HDMI
-- `lcd` --> to witch to LCD
+- `hdmi` --> switch to HDMI
+- `lcd` --> switch to LCD
 
 ## How do I set up VNC?
 

README.md

@@ -271,7 +271,7 @@ This is also the best option if you don't like to run your RaspberryPi 3 with a
 
 More details: [I have the full blockchain on another computer. How do I copy it to the RaspiBlitz?](FAQ.md#i-have-the-full-blockchain-on-another-computer-how-do-i-copy-it-to-the-raspiblitz)
 
-#### 3. Torrent Fallback
+#### 3. Torrent Fallback (NOTE: to-be-deprecated in 1.6)
 
 *This is recommended for old RaspberryPi 3s - for the newer RaspberryPi 4 you might consider the `SYNC` option.*
 
@@ -422,7 +422,7 @@ This is the screen that gets displayed on the LCD/display. It's useful to call i
 
 Before you can open channels with other nodes you need to put some coins onto your LND on-chain wallet. Use this option to generate an address to send funds to.
 
-*Reminder: RaspiBlitz & LND is still experimental software. With funding your LND node you accept the risk of loosing funds. So just play with small amounts - something in then area of 20 EUR/USD should be enough to make your first experiences. Also, it's a good privacy practice to [coinjoin your coins](https://bitcoin-only.com/#privacy) before sending them to any Lightning Network wallet.*
+*Reminder: RaspiBlitz & LND is still experimental software. With funding your LND node you accept the risk of losing funds. So just play with small amounts - something in then area of 20 EUR/USD should be enough to make your first experiences. Also, it's a good privacy practice to [coinjoin your coins](https://bitcoin-only.com/#privacy) before sending them to any Lightning Network wallet.*
 
 You can make multiple fundings - so you can start with small amounts first to test. LND will generate always a different address, but all funds you send will get into the same LND on-chain wallet.
 

home.admin/00raspiblitz.sh

@@ -157,7 +157,7 @@ waitUntilChainNetworkIsReady()
 
           whiptail --title "RaspiBlitz - Repair Script" --yes-button "DELETE+REPAIR" --no-button "Ignore" --yesno "Your blockchain data needs to be repaired.
 This can be due to power problems or a failing HDD.
-For more info see: https://raspiblitz.com -> FAQ
+For more info see: https://raspiblitz.org -> FAQ
 
 Before RaspiBlitz can offer you repair options the old
 corrupted blockchain needs to be deleted while your LND

home.admin/70initLND.sh

@@ -172,7 +172,7 @@ if [ ${walletExists} -eq 0 ]; then
 
   # UI: Ask if user wants NEW wallet or RECOVER a wallet
   OPTIONS=(NEW "Setup a brand new Lightning Node (DEFAULT)" \
-           OLD "I had a old Node I want to recover/restore")
+           OLD "I had an old Node I want to recover/restore")
   CHOICE=$(dialog --backtitle "RaspiBlitz" --clear --title "LND Setup" --menu "LND Data & Wallet" 11 60 6 "${OPTIONS[@]}" 2>&1 >/dev/tty)
   echo "choice($CHOICE)"
 
@@ -476,4 +476,4 @@ You may now give it
 extra time to rescan.
 " 10 25
 
-fi
+fi

home.admin/_version.info

@@ -1,2 +1,2 @@
 # RaspiBlitz Version - always [major].[main].[sub]
-codeVersion="1.6.0rc2"
+codeVersion="1.6.0rc3"

home.admin/config.scripts/blitz.setpassword.sh

@@ -139,11 +139,11 @@ elif [ "${abcd}" = "b" ]; then
   if [ ${#newPassword} -eq 0 ]; then
     clear
 
-    # ask user for new password A (first time)
-    password1=$(whiptail --passwordbox "\nPlease enter your RPC Password B:\n(min 8chars, 1word, chars+number, no specials)" 10 52 "" --title "Password A" --backtitle "RaspiBlitz - Setup" 3>&1 1>&2 2>&3)
+    # ask user for new password B (first time)
+    password1=$(whiptail --passwordbox "\nPlease enter your RPC Password B:\n(min 8chars, 1word, chars+number, no specials)" 10 52 "" --title "Password B" --backtitle "RaspiBlitz - Setup" 3>&1 1>&2 2>&3)
 
-    # ask user for new password A (second time)
-    password2=$(whiptail --passwordbox "\nRe-Enter Password B:\n" 10 52 "" --title "Password A" --backtitle "RaspiBlitz - Setup" 3>&1 1>&2 2>&3)
+    # ask user for new password B (second time)
+    password2=$(whiptail --passwordbox "\nRe-Enter Password B:\n" 10 52 "" --title "Password B" --backtitle "RaspiBlitz - Setup" 3>&1 1>&2 2>&3)
 
     # check if passwords match
     if [ "${password1}" != "${password2}" ]; then
@@ -362,4 +362,4 @@ elif [ "${abcd}" = "x" ]; then
 else
   echo "FAIL: there is no password '${abcd}' (reminder: use lower case)"
   exit 1
-fi
+fi

home.admin/config.scripts/blitz.subscriptions.letsencrypt.py

@@ -23,10 +23,10 @@ if len(sys.argv) <= 1 or sys.argv[1] == "-h" or sys.argv[1] == "help":
     print("# manage letsencrypt HTTPS certificates for raspiblitz")
     print("# blitz.subscriptions.letsencrypt.py create-ssh-dialog")
     print("# blitz.subscriptions.ip2tor.py subscriptions-list")
-    print("# blitz.subscriptions.ip2tor.py subscription-new dyndns|ip duckdns|freedns id token ip|tor|ip&tor")
-    print("# blitz.subscriptions.ip2tor.py subscription-detail id")
-    print("# blitz.subscriptions.ip2tor.py domain-by-ip ip")
-    print("# blitz.subscriptions.ip2tor.py subscription-cancel id")
+    print("# blitz.subscriptions.ip2tor.py subscription-new <dyndns|ip> <duckdns> <id> <token> [ip|tor|ip&tor]")
+    print("# blitz.subscriptions.ip2tor.py subscription-detail <id>")
+    print("# blitz.subscriptions.ip2tor.py domain-by-ip <ip>")
+    print("# blitz.subscriptions.ip2tor.py subscription-cancel <id>")
     sys.exit(1)
 
 ####### BASIC SETTINGS #########

home.admin/config.scripts/lnd.rescue.sh

@@ -70,9 +70,9 @@ if [ ${mode} = "backup" ]; then
   # offer SCP for download
   clear
   echo
-  echo "*****************************"
-  echo "* DOWNLOAD THE REASCUE FILE *"
-  echo "*****************************"
+  echo "****************************"
+  echo "* DOWNLOAD THE RESCUE FILE *"
+  echo "****************************"
   echo 
   echo "ON YOUR LAPTOP - RUN IN NEW TERMINAL:"
   echo "scp -r 'admin@${localip}:/home/admin/lnd-rescue-*.tar.gz' ./"
@@ -80,7 +80,7 @@ if [ ${mode} = "backup" ]; then
   echo "Use password A to authenticate file transfer."
   echo "Check for correct file size after transfer: ${byteSize} byte"
   echo
-  echo "BEWARE: Your Lightning node is now stopped. Its safe to backup the data and"
+  echo "BEWARE: Your Lightning node is now stopped. It's safe to backup the data and"
   echo "restore it on a fresh RaspiBlitz. But once this Lightning node gets started"
   echo "again or rebooted its not adviced to restore the backup file anymore because"
   echo "it cointains then outdated channel data & can lead to loss of channel funds."
@@ -146,8 +146,8 @@ elif [ ${mode} = "restore" ]; then
           echo "OK -> checksum looks good: ${md5checksum}"
         else
           echo "!!! FAIL -> Checksum not correct."
-          echo "Maybe transfer failed? Continue on your own risk!"
-          echo "Recommend to abort and upload again!"
+          echo "Maybe transfer failed? Continue at your own risk!"
+          echo "It is recommended to abort and upload again!"
         fi
 
         # overrride test
@@ -275,4 +275,4 @@ elif [ ${mode} = "scb-up" ]; then
 
 else
   echo "unknown parameter '${mode}' - exit"
-fi
+fi