From 1c23c706e1704635401a213b6efe703c161d8e4a Mon Sep 17 00:00:00 2001
From: farhan <farhan@mfgbhatti.com>
Date: Fri, 12 Nov 2021 20:05:04 +0000
Subject: [PATCH] removing errors and fine tuning

---
 0-preinstall.sh | 34 ++++++++++++++++++----------------
 1 file changed, 18 insertions(+), 16 deletions(-)

diff --git a/0-preinstall.sh b/0-preinstall.sh
index f03f7b3..c77e9bf 100755
--- a/0-preinstall.sh
+++ b/0-preinstall.sh
@@ -65,22 +65,24 @@ fi
 
 # make filesystems
 echo -e "\nCreating Filesystems...\n$HR"
-if [[ ${DISK} =~ "nvme" && ${FS} == "btrfs" ]]; then
-mkfs.vfat -F32 -n "EFIBOOT" "${DISK}p2"
-mkfs.btrfs -L "ROOT" "${DISK}p3" -f
-mount -t btrfs "${DISK}p3" /mnt
-elif [[ ${DISK} =~ "sd" && ${FS} == "btrfs"]]; then
-mkfs.vfat -F32 -n "EFIBOOT" "${DISK}2"
-mkfs.btrfs -L "ROOT" "${DISK}3" -f
-mount -t btrfs "${DISK}3" /mnt
-elif [[ ${DISK} =~ "nvme" && ${FS} == "ext4" ]]; then
-mkfs.vfat -F32 -n "EFIBOOT" "${DISK}p2"
-mkfs.ext4 -L "ROOT" "${DISK}p3"
-mount -t ext4 "${DISK}p3" /mnt
-else
-mkfs.vfat -F32 -n "EFIBOOT" "${DISK}2"
-mkfs.ext4 -L "ROOT" "${DISK}3"
-mount -t ext4 "${DISK}3" /mnt
+if [[ ${DISK} =~ "nvme"]]; then
+    if [[ ${FS} == "btrfs" ]]; then
+        mkfs.vfat -F32 -n "EFIBOOT" "${DISK}p2"
+        mkfs.btrfs -L "ROOT" "${DISK}p3" -f
+        mount -t btrfs "${DISK}p3" /mnt
+    else
+        mkfs.vfat -F32 -n "EFIBOOT" "${DISK}p2"
+        mkfs.ext4 -L "ROOT" "${DISK}p3"
+        mount -t ext4 "${DISK}p3" /mnt
+else [[ ${DISK} =~ "sd"]]; then
+    if [[ ${FS} == "btrfs" ]]; then
+        mkfs.vfat -F32 -n "EFIBOOT" "${DISK}2"
+        mkfs.btrfs -L "ROOT" "${DISK}3" -f
+        mount -t btrfs "${DISK}3" /mnt
+    else
+        mkfs.vfat -F32 -n "EFIBOOT" "${DISK}p2"
+        mkfs.ext4 -L "ROOT" "${DISK}p3"
+        mount -t ext4 "${DISK}p3" /mnt
 fi
 if [[ ${FS} =~ "btrfs" ]]; then
 ls /mnt | xargs btrfs subvolume delete