From b1d2ae4528cac84ca1db5125d3b7ac8fee63530a Mon Sep 17 00:00:00 2001
From: rootzoll <rotzoll@MacBook2020.fritz.box>
Date: Mon, 29 Jun 2020 21:38:20 +0200
Subject: [PATCH] #1298 allow cancel

---
 home.admin/70initLND.sh                       |  2 +-
 .../config.scripts/blitz.setpassword.sh       | 40 ++++++++++---------
 2 files changed, 23 insertions(+), 19 deletions(-)

diff --git a/home.admin/70initLND.sh b/home.admin/70initLND.sh
index a88d378f8..a8877e175 100755
--- a/home.admin/70initLND.sh
+++ b/home.admin/70initLND.sh
@@ -354,7 +354,7 @@ to protect the seed words. Most users did not set this.
       " 11 65
       if [ $? -eq 1 ]; then
         sudo shred -u /home/admin/.pass.tmp 2>/dev/null
-        sudo /home/admin/config.scripts/blitz.setpassword.sh x "Enter extra Password D" /home/admin/.pass.tmp
+        sudo /home/admin/config.scripts/blitz.setpassword.sh x "Enter extra Password D" /home/admin/.pass.tmp empty-allowed
         passwordD=`sudo cat /home/admin/.pass.tmp`
         sudo shred -u /home/admin/.pass.tmp 2>/dev/null
       fi
diff --git a/home.admin/config.scripts/blitz.setpassword.sh b/home.admin/config.scripts/blitz.setpassword.sh
index b30940e34..fd0f8d358 100644
--- a/home.admin/config.scripts/blitz.setpassword.sh
+++ b/home.admin/config.scripts/blitz.setpassword.sh
@@ -326,26 +326,30 @@ elif [ "${abcd}" = "x" ]; then
       exit 1
     fi
 
-    # password zero
-    if [ ${#password1} -eq 0 ] && [ "$4" != "empty-allowed" ]; then
-      dialog --backtitle "RaspiBlitz" --msgbox "FAIL -> Password cannot be empty\nPlease try again ..." 6 52
-      sudo /home/admin/config.scripts/blitz.setpassword.sh x "$2" "$3"
-      exit 1
-    fi
+    if [ "$4" != "empty-allowed" ]; then
 
-    # check that password does not contain bad characters
-    clearedResult=$(echo "${password1}" | tr -dc '[:alnum:]-.' | tr -d ' ')
-    if [ ${#clearedResult} != ${#password1} ] || [ ${#clearedResult} -eq 0 ]; then
-      dialog --backtitle "RaspiBlitz" --msgbox "FAIL -> Contains bad characters (spaces, special chars)\nPlease try again ..." 6 52
-      sudo /home/admin/config.scripts/blitz.setpassword.sh x "$2" "$3"
-      exit 1
-    fi
+      # password zero
+      if [ ${#password1} -eq 0 ]; then
+        dialog --backtitle "RaspiBlitz" --msgbox "FAIL -> Password cannot be empty\nPlease try again ..." 6 52
+        sudo /home/admin/config.scripts/blitz.setpassword.sh x "$2" "$3"
+        exit 1
+      fi
+
+      # check that password does not contain bad characters
+      clearedResult=$(echo "${password1}" | tr -dc '[:alnum:]-.' | tr -d ' ')
+      if [ ${#clearedResult} != ${#password1} ] || [ ${#clearedResult} -eq 0 ]; then
+        dialog --backtitle "RaspiBlitz" --msgbox "FAIL -> Contains bad characters (spaces, special chars)\nPlease try again ..." 6 52
+        sudo /home/admin/config.scripts/blitz.setpassword.sh x "$2" "$3"
+        exit 1
+      fi
+
+      # password longer than 8
+      if [ ${#password1} -lt 8 ]; then
+        dialog --backtitle "RaspiBlitz" --msgbox "FAIL -> Password length under 8\nPlease try again ..." 6 52
+        sudo /home/admin/config.scripts/blitz.setpassword.sh x "$2" "$3"
+        exit 1
+      fi
 
-    # password longer than 8
-    if [ ${#password1} -lt 8 ] && [ "$4" != "empty-allowed" ]; then
-      dialog --backtitle "RaspiBlitz" --msgbox "FAIL -> Password length under 8\nPlease try again ..." 6 52
-      sudo /home/admin/config.scripts/blitz.setpassword.sh x "$2" "$3"
-      exit 1
     fi
 
     # store result is file