From b8e322578c0323724c419e4a0a9ecdf4ff96df16 Mon Sep 17 00:00:00 2001
From: rootzoll <christian@geektank.de>
Date: Fri, 21 May 2021 20:46:18 -0500
Subject: [PATCH] loop on cancel

---
 home.admin/setup.scripts/dialogBasicSetup.sh   | 5 ++++-
 home.admin/setup.scripts/setupDialogControl.sh | 8 +++-----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/home.admin/setup.scripts/dialogBasicSetup.sh b/home.admin/setup.scripts/dialogBasicSetup.sh
index b405f07af..fed60c80a 100644
--- a/home.admin/setup.scripts/dialogBasicSetup.sh
+++ b/home.admin/setup.scripts/dialogBasicSetup.sh
@@ -13,7 +13,7 @@ CHOICE=$(dialog --clear \
                 --backtitle "RaspiBlitz ${codeVersion} - Setup" \
                 --title "⚡ Welcome to your RaspiBlitz ⚡" \
                 --menu "\nChoose how you want to setup your RaspiBlitz: \n " \
-                13 64 7 \
+                12 64 6 \
                 "${OPTIONS[@]}" \
                 2>&1 >/dev/tty)
 clear
@@ -28,6 +28,9 @@ case $CHOICE in
             ;;
         SHUTDOWN)
             # 2 --> SHUTDOWN
+            clear
+            echo "Shutting down without changes ..."
+            echo "Cut power when you see no status LED action anymore."
             exit 2
             ;;
         *)
diff --git a/home.admin/setup.scripts/setupDialogControl.sh b/home.admin/setup.scripts/setupDialogControl.sh
index 67451f24d..9aa6bdb31 100755
--- a/home.admin/setup.scripts/setupDialogControl.sh
+++ b/home.admin/setup.scripts/setupDialogControl.sh
@@ -82,7 +82,7 @@ if [ "${setupPhase}" == "setup" ]; then
 
   # exit to terminal
   if [ "${menuresult}" == "3" ]; then
-    exit 0
+    exit 1
   fi
 
   # shutdown without changes
@@ -95,8 +95,7 @@ if [ "${setupPhase}" == "setup" ]; then
   if [ "${menuresult}" == "1" ]; then
     /home/admin/setup.scripts/dialogMigration.sh raspiblitz
     if [ "$?" == "1" ]; then
-      echo "Upload did not worked ... doing shutdown. Restart for new try."
-      sudo shutdown now
+      # upload did not worked .. exit with 0 to restart process from outside loop
       exit 0
     fi
     # user needs to reset password A
@@ -113,8 +112,7 @@ if [ "${setupPhase}" == "setup" ]; then
     echo "# Starting Blockchain & Lightning selection ..."
     /home/admin/setup.scripts/dialogBlockchainLightning.sh
     if [ "$?" == "1" ]; then
-      echo "Shutting down ... Restart for new try."
-      sudo shutdown now
+      # exit with 0 to restart process from outside loop
       exit 0
     fi