From 286438d3afc816805d2c189b0b14cd5d49c7007e Mon Sep 17 00:00:00 2001
From: rootzoll <christian@geektank.de>
Date: Sun, 29 Aug 2021 22:10:50 +0200
Subject: [PATCH] fix jump to main menu

---
 home.admin/00raspiblitz.sh                    | 6 +++---
 home.admin/config.scripts/blitz.statusscan.sh | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/home.admin/00raspiblitz.sh b/home.admin/00raspiblitz.sh
index 224111e61..5aae51215 100755
--- a/home.admin/00raspiblitz.sh
+++ b/home.admin/00raspiblitz.sh
@@ -100,7 +100,7 @@ do
   if [ -f /var/cache/raspiblitz/raspiblitz.status ]; then
 
     # run statusscan with timeout - if status scan was not killed it will copy over the 
-    timeout 10 /home/admin/config.scripts/blitz.statusscan.sh > /var/cache/raspiblitz/raspiblitz.status.tmp
+    timeout 15 /home/admin/config.scripts/blitz.statusscan.sh ${lightning} > /var/cache/raspiblitz/raspiblitz.status.tmp
     result=$?
     if [ "${result}" == "0" ]; then
      # statusscan finished in under 10 seconds - use results
@@ -115,7 +115,7 @@ do
   
     # first time run statusscan without timeout
     echo "# running statusscan for the first time ... can take time"
-    /home/admin/config.scripts/blitz.statusscan.sh > /var/cache/raspiblitz/raspiblitz.status
+    /home/admin/config.scripts/blitz.statusscan.sh > /var/cache/raspiblitz/raspiblitz.status ${lightning}
 
   fi
 
@@ -164,7 +164,7 @@ do
   #####################################
   # INITIAL BLOCKCHAIN SYNC (SUBLOOP)
   #####################################
-  if [ "${setupPhase}" == "done" ] && [ "${state}" == "ready" ] && [ "${initialSync}" == "1" ]; then
+  if [ "${setupPhase}" == "done" ] && [ "${state}" == "ready" ] && [ "${syncedToChain}" != "1" ]; then
     echo "debug wait eventBlockchainSync.sh ..."
     sleep 3
     #echo "# eventBlockchainSync.sh ssh loop"
diff --git a/home.admin/config.scripts/blitz.statusscan.sh b/home.admin/config.scripts/blitz.statusscan.sh
index bf466b4ae..a75af417f 100755
--- a/home.admin/config.scripts/blitz.statusscan.sh
+++ b/home.admin/config.scripts/blitz.statusscan.sh
@@ -279,7 +279,7 @@ fi
 # is CLN running
 clnRunning=$(systemctl status ${netprefix}lightningd.service 2>/dev/null | grep -c running)
 echo "clnActive=${clnRunning}"
-if [ ${clnRunning} -eq 1 ] && [ "${LNTYPE}" == "cln" ]; then
+if [ "${clnRunning}" == "1" ] && [ "${LNTYPE}" == "cln" ]; then
   clnInfo=$($lightningcli_alias getinfo)
   clnBlockHeight=$(echo "${clnInfo}" | jq -r '.blockheight' | tr -cd '[[:digit:]]')
   scanProgress=$(echo "scale=2; $clnBlockHeight*100/$total" | bc)