From 246ffe46bdbd442a6e7f705027e005aad26d110a Mon Sep 17 00:00:00 2001
From: rootzoll <christian@geektank.de>
Date: Fri, 2 Jul 2021 23:11:50 +0200
Subject: [PATCH] harmonize ready state

---
 home.admin/_bootstrap.sh                       | 4 ++--
 home.admin/setup.scripts/controlFinalDialog.sh | 4 ++--
 home.admin/setup.scripts/eventInfoWait.sh      | 8 --------
 3 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/home.admin/_bootstrap.sh b/home.admin/_bootstrap.sh
index b18289ee6..9c96949b6 100755
--- a/home.admin/_bootstrap.sh
+++ b/home.admin/_bootstrap.sh
@@ -583,12 +583,12 @@ if [ ${isMounted} -eq 0 ]; then
     sed -i "s/^message=.*/message='Setup Done'/g" ${infoFile}
   else
     echo "# Skip WAIT LOOP boot directly into main menu ..." >> $logFile
-    sed -i "s/^state=.*/state=finalready/g" ${infoFile}
+    sed -i "s/^state=.*/state=ready/g" ${infoFile}
     sed -i "s/^message=.*/message='Setup Done'/g" ${infoFile}
   fi
 
   source ${infoFile}
-  until [ "${state}" == "finalready" ]
+  until [ "${state}" == "ready" ]
   do
 
     # TODO: DETECT WHEN USER SETUP IS DONE
diff --git a/home.admin/setup.scripts/controlFinalDialog.sh b/home.admin/setup.scripts/controlFinalDialog.sh
index 32d882b8b..b5cd17b34 100755
--- a/home.admin/setup.scripts/controlFinalDialog.sh
+++ b/home.admin/setup.scripts/controlFinalDialog.sh
@@ -40,7 +40,7 @@ if [ "${syncProgressFull}" != "" ] && [ "${network}" == "bitcoin" ] && [ ${syncP
   if [ "${CHOICESUB}" == "COPY" ]; then
     /home/admin/config.scripts/blitz.copychain.sh target
   fi
-  
+
 fi
 
 ############# SCB activation
@@ -122,4 +122,4 @@ fi
 echo "Starting ... (please wait)"
 
 # signal to backend that all is good and it can continue
-sudo sed -i "s/^state=.*/state='finalready'/g" /home/admin/raspiblitz.info 
\ No newline at end of file
+sudo sed -i "s/^state=.*/state='ready'/g" /home/admin/raspiblitz.info 
\ No newline at end of file
diff --git a/home.admin/setup.scripts/eventInfoWait.sh b/home.admin/setup.scripts/eventInfoWait.sh
index f7b6bae4e..98c143765 100644
--- a/home.admin/setup.scripts/eventInfoWait.sh
+++ b/home.admin/setup.scripts/eventInfoWait.sh
@@ -176,14 +176,6 @@ ssh admin@${localip}
 Use your Password A
 " 7 41
 
-elif [ "${eventID}" == "finalready" ]; then
-
-    dialog --backtitle "${backtitle}" --cr-wrap --infobox "
-Setup-Done - Please Wait
-ssh admin@${localip}
-Use your Password A
-" 7 41
-
 elif [ "${eventID}" == "shutdown" ]; then
 
     dialog --backtitle "${backtitle}" --cr-wrap --infobox "