From b73571530554b24667b4c4e06d83d2c2a57c151c Mon Sep 17 00:00:00 2001
From: arno <arnobugs@hotmail.com>
Date: Sun, 1 Nov 2020 11:30:07 +0100
Subject: [PATCH] migration - btrfs and ext4 (format and tempmount) (#1706)

---
 home.admin/config.scripts/blitz.migration.sh | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/home.admin/config.scripts/blitz.migration.sh b/home.admin/config.scripts/blitz.migration.sh
index f2d4b0de7..1abba0f68 100755
--- a/home.admin/config.scripts/blitz.migration.sh
+++ b/home.admin/config.scripts/blitz.migration.sh
@@ -287,18 +287,21 @@ if [ "$1" = "import-gui" ]; then
   OPTIONS+=(BTRFS "BTRFS & 3 Partitions (experimental)")
 
   useBlockchain=0
+  hddFormat=None
   CHOICE=$(whiptail --clear --title "Formatting ${hddCandidate}" --menu "" 10 52 3 "${OPTIONS[@]}" 2>&1 >/dev/tty)
   clear
   case $CHOICE in
     EXT4)
+      hddFormat=ext4
       echo "EXT4 FORMAT -->"
-      source <(sudo /home/admin/config.scripts/blitz.datadrive.sh format ext4 ${hddCandidate})
+      source <(sudo /home/admin/config.scripts/blitz.datadrive.sh format ext4 ${hddPartitionCandidate})
       if [ ${#error} -gt 0 ]; then
         echo "FAIL --> ${error}"
         exit 1
       fi
       ;;
     BTRFS)
+      hddFormat=btrfs
       echo "BTRFS FORMAT"
       source <(sudo /home/admin/config.scripts/blitz.datadrive.sh format btrfs ${hddCandidate})
       if [ ${#error} -gt 0 ]; then
@@ -316,11 +319,19 @@ if [ "$1" = "import-gui" ]; then
       ;;
   esac
 
+  if [ ${useBlockchain} -eq 1 ]; then
+     if [ ${isBTRFS} -eq 1 ]; then
+        hddFormat=btrfs
+     else
+        hddFormat=ext4
+     fi
+  fi
+
   # now temp mount the HDD/SSD
-  if [ ${isBTRFS} -eq 0 ]; then
-    source <(sudo /home/admin/config.scripts/blitz.datadrive.sh tempmount ${hddPartitionCandidate})
+  if [ "$hddFormat" == "btrfs" ]; then
+     source <(sudo /home/admin/config.scripts/blitz.datadrive.sh tempmount ${hddCandidate})
   else
-    source <(sudo /home/admin/config.scripts/blitz.datadrive.sh tempmount ${hddCandidate})
+     source <(sudo /home/admin/config.scripts/blitz.datadrive.sh tempmount ${hddPartitionCandidate})
   fi
   if [ ${#error} -gt 0 ]; then
     echo "FAIL: Was not able to temp mount the HDD/SSD --> ${error}"