From c3836219f86f3213e5b0a4d0a8520e15da2e580e Mon Sep 17 00:00:00 2001
From: Christian Rotzoll <rotzoll@googlemail.com>
Date: Mon, 19 Oct 2020 01:54:28 +0200
Subject: [PATCH] Fixing Pyblock & Recovery #1648 (#1682)

---
 home.admin/_bootstrap.provision.sh        | 15 +++++++++++++++
 home.admin/config.scripts/internet.tor.sh |  2 +-
 home.admin/config.scripts/lnd.check.sh    |  6 ++++++
 3 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/home.admin/_bootstrap.provision.sh b/home.admin/_bootstrap.provision.sh
index 574d6aae3..c9e3451b2 100755
--- a/home.admin/_bootstrap.provision.sh
+++ b/home.admin/_bootstrap.provision.sh
@@ -26,6 +26,12 @@ if [ ${configExists} -eq 0 ]; then
   exit 1
 fi
 
+# check that default parameter exist in config
+parameterExists=$(cat /mnt/hdd/raspiblitz.conf | grep -c "lndExtraParameter=")
+if [ ${parameterExists} -eq 0 ]; then
+  echo "lndExtraParameter=''" >> ${configFile}
+fi
+
 # check if file system was expanded to full capacity and sd card is bigger than 8GB
 # see: https://github.com/rootzoll/raspiblitz/issues/936
 echo "CHECK IF SD CARD NEEDS EXPANSION" >> ${logFile}
@@ -491,6 +497,15 @@ else
   echo "Provisioning kindle-display - keep default" >> ${logFile}
 fi
 
+# pyblock
+if [ "${pyblock}" = "on" ]; then
+  echo "Provisioning pyblock - run config script" >> ${logFile}
+  sudo sed -i "s/^message=.*/message='Setup pyblock'/g" ${infoFile}
+  sudo -u admin /home/admin/config.scripts/bonus.pyblock.sh on >> ${logFile} 2>&1
+else
+  echo "Provisioning pyblock - keep default" >> ${logFile}
+fi
+
 # stacking-sats-kraken
 if [ "${stackingSatsKraken}" = "on" ]; then
   echo "Provisioning Stacking Sats Kraken - run config script" >> ${logFile}
diff --git a/home.admin/config.scripts/internet.tor.sh b/home.admin/config.scripts/internet.tor.sh
index c76a3e9e3..2714ea9c5 100755
--- a/home.admin/config.scripts/internet.tor.sh
+++ b/home.admin/config.scripts/internet.tor.sh
@@ -274,7 +274,7 @@ if [ "$1" = "1" ] || [ "$1" = "on" ]; then
     prepareTorSources
 
     echo "*** Updating System ***"
-    sudo apt-get update -y
+    sudo apt update -y
     echo ""
 
     echo "*** Install Tor & NYX ***"
diff --git a/home.admin/config.scripts/lnd.check.sh b/home.admin/config.scripts/lnd.check.sh
index 56d75ca9f..acf15bc34 100755
--- a/home.admin/config.scripts/lnd.check.sh
+++ b/home.admin/config.scripts/lnd.check.sh
@@ -174,6 +174,12 @@ if [ "$1" == "basic-setup" ]; then
   fi
   echo "rpcpasscorrect=${rpcpasscorrect}"
 
+  # check basic LND logs
+  torConnectionProblem=$(sudo journalctl -u lnd -b --no-pager -n14 | grep "lnd\[" | grep -c "dial tcp 127.0.0.1:9050: connect: connection refused")
+  if [ ${torConnectionProblem} -gt 0 ]; then
+    echo "err='Tor tcp connection refused'"
+  fi
+
 else
   echo "# FAIL: parameter not known - run with -h for help"
   exit 1