From 384dcde593886e4a41fd6d9699aaa127ac421477 Mon Sep 17 00:00:00 2001
From: rootzoll <christian@geektank.de>
Date: Mon, 3 May 2021 15:54:45 +0200
Subject: [PATCH] offer user cancel on upload

---
 home.admin/config.scripts/lnd.backup.sh     | 20 +++++++++++++-------
 home.admin/setup.scripts/dialogMigration.sh | 19 +++++++++++++------
 2 files changed, 26 insertions(+), 13 deletions(-)

diff --git a/home.admin/config.scripts/lnd.backup.sh b/home.admin/config.scripts/lnd.backup.sh
index 348c69ded..85418ef36 100755
--- a/home.admin/config.scripts/lnd.backup.sh
+++ b/home.admin/config.scripts/lnd.backup.sh
@@ -405,24 +405,30 @@ if [ ${mode} = "scb-import-gui" ]; then
       elif [ "${error}" == "not-found" ]; then
         echo "!! WARNING !!"
         echo "There was no upload found in ${defaultUploadPath}"
-        echo "Make sure you upload only one tar.gz-file and start again."
-        echo "PRESS ENTER to continue & retry"
-        read key
+        echo "PRESS ENTER to continue & retry ... or 'x'+ ENTER to cancel"
+        read keyRetry
       elif [ "${error}" == "multiple" ]; then
         echo "!! WARNING !!"
         echo "There are multiple lnd-rescue files in directory ${defaultUploadPath}"
         echo "Make sure you upload only one tar.gz-file and start again."
-        echo "PRESS ENTER to continue & retry"
-        read key
+        echo "PRESS ENTER to continue & retry ... or 'x'+ ENTER to cancel"
+        read keyRetry
       elif [ "${error}" == "invalid" ]; then
         echo "!! WARNING !!"
         echo "The file uploaded is not a valid (complete upload failed or not correct file)."
-        echo "PRESS ENTER to continue & retry"
-        read key
+        echo "PRESS ENTER to continue & retry ... or 'x'+ ENTER to cancel"
+        read keyRetry
       else
         echo "!! WARNING !! Unknown State (report to devs)"
         exit 1
       fi
+
+      if [ "${keyRetry}" == "x" ] || [ "${keyRetry}" == "X" ] || [ "${keyRetry}" == "'x'" ]; then
+        # create no result file and exit
+        echo "# USER CANCEL"
+        exit 1
+      fi
+
   done
 
   # in setup scenario the final import is happening during provison
diff --git a/home.admin/setup.scripts/dialogMigration.sh b/home.admin/setup.scripts/dialogMigration.sh
index 709469f5a..529d16c40 100755
--- a/home.admin/setup.scripts/dialogMigration.sh
+++ b/home.admin/setup.scripts/dialogMigration.sh
@@ -72,23 +72,30 @@ if [ "${migrationOS}" == "raspiblitz" ]; then
         echo "!! WARNING !!"
         echo "There was no upload found in ${defaultUploadPath}"
         echo "Make sure you upload only one tar.gz-file and start again."
-        echo "PRESS ENTER to continue & retry"
-        read key
+        echo "PRESS ENTER to continue & retry ... or 'x'+ ENTER to cancel"
+        read keyRetry
       elif [ "${error}" == "multiple" ]; then
         echo "!! WARNING !!"
         echo "There are multiple lnd-rescue files in directory ${defaultUploadPath}"
         echo "Make sure you upload only one tar.gz-file and start again."
-        echo "PRESS ENTER to continue & retry"
-        read key
+        echo "PRESS ENTER to continue & retry ... or 'x'+ ENTER to cancel"
+        read keyRetry
       elif [ "${error}" == "invalid" ]; then
         echo "!! WARNING !!"
         echo "The file uploaded is not a valid (complete upload failed or not correct file)."
-        echo "PRESS ENTER to continue & retry"
-        read key
+        echo "PRESS ENTER to continue & retry ... or 'x'+ ENTER to cancel"
+        read keyRetry
       else
+        # create no result file and exit
         echo "!! WARNING !! Unknown State (report to devs) error(${error})"
         exit 1
       fi
+
+      if [ "${keyRetry}" == "x" ] || [ "${keyRetry}" == "X" ] || [ "${keyRetry}" == "'x'" ]; then
+        # create no result file and exit
+        echo "# USER CANCEL"
+        exit 1
+      fi
   done
 
   # further checks and unpacking will be done when migration is processed (not part of dialog)