From 6fcbf7d07444f750116469dad7015ca555965f81 Mon Sep 17 00:00:00 2001
From: rootzoll <christian@geektank.de>
Date: Wed, 5 May 2021 01:10:41 +0200
Subject: [PATCH] setup menu on raspiblitz loop

---
 home.admin/00raspiblitz.sh | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/home.admin/00raspiblitz.sh b/home.admin/00raspiblitz.sh
index 203f44c21..58ba6236e 100755
--- a/home.admin/00raspiblitz.sh
+++ b/home.admin/00raspiblitz.sh
@@ -60,10 +60,24 @@ do
   #####################################
 
   # if setup is done & state is ready .. jump to main menu
-  if [ "${setupPhase}" == "done" ] || [ "${state}" == "ready" ]; then
+  if [ "${setupPhase}" == "done" ] && [ "${state}" == "ready" ]; then
     # push user to main menu
     /home/admin/00mainMenu.sh
-    # use the exit code from main menu als signal if menu loop should exited
+    # use the exit code from main menu as signal if menu loop should exited
+    # 0 = continue loop / everything else = break loop and exit to terminal
+    exitMenuLoop=$?
+    if [ "${exitMenuLoop}" != "0" ]; then break; fi
+  fi
+
+  #####################################
+  # SETUP SSH MENU
+  #####################################
+
+  # if setup is done & state is ready .. jump to main menu
+  if [ "${setupPhase}" != "done" ] && [ "${state}" == "waitsetup" ]; then
+    # push user to main menu
+    /home/admin/setup.scripts/setupDialogControl.sh
+    # use the exit code from setup menu as signal if menu loop should exited
     # 0 = continue loop / everything else = break loop and exit to terminal
     exitMenuLoop=$?
     if [ "${exitMenuLoop}" != "0" ]; then break; fi
@@ -137,7 +151,9 @@ do
 
 done
 echo "# mainmenu signaled exit code '${exitMenuLoop}' --> exit to terminal"
+exit 0
 
+################# TODO: MOVE PARTS BELOW TO APROPIATE NEW PLACE
 
 # check if HDD is from another fullnode OS and offer migration
 if [ "${hddGotMigrationData}" != "" ] && [ "${hddGotMigrationData}" != "none" ]; then