Properly configured 'zfs.sh' and 'partition.sh' to recognize flags for running different parts of the script

partition.sh

@@ -8,60 +8,71 @@ source \
 source \
 	"${BASEDIR}/system.conf"
 
-if [[ ! "${disk}" == **/dev/disk/by-id/** ]]; then
-	if [[ "${disk}" == **/dev/nvme** ]]; then
-		part3='p3'
+
+if [[ "${1}" == '--disk' ]]; then
+	if [[ ! "${disk}" == **/dev/disk/by-id/** ]]; then
+		if [[ "${disk}" == **/dev/nvme** ]]; then
+			part3='p3'
+		else
+			part3='3'
+		fi
 	else
-		part3='3'
+		part3='-part3'
 	fi
-else
-	part3='-part3'
-fi
 
-swapoff \
-	--all
+	swapoff \
+		--all
 
-wipefs \
-	-a \
-	${disk}
-
-if [[ ! "${diskType}" == 'HDD' ]]; then
-	blkdiscard \
-		-f \
+	wipefs \
+		-a \
 		${disk}
-fi
 
-sgdisk \
-	--zap-all \
-	${disk}
-
-sgdisk \
-	-n1:0:+512M \
-	-t1:EF00 \
-	-c1:EFI \
-	${disk}
-
-if [[ "${enableSwap}" == "yes" ]]; then
-	swapSize="$(((($(vmstat -sS M | grep 'total memory' | sed 's/ M total memory//') / 1024) + 1) * 2))"
-
-	if [[ "${swapSize#}" -gt '32' ]]; then
-		swapSize='32'
+	if [[ ! "${diskType}" == 'HDD' ]]; then
+		blkdiscard \
+			-f \
+			${disk}
 	fi
 
 	sgdisk \
-		-n2:0:+${swapSize}G \
-		-t2:BF02 \
-		-c2:swap \
+		--zap-all \
 		${disk}
-fi
 
-sgdisk \
-	-n3:0:0 \
-	-t3:BF00 \
-	-c3:${ID} \
-	${disk}
+	sgdisk \
+		-n1:0:+512M \
+		-t1:EF00 \
+		-c1:EFI \
+		${disk}
+
+	if [[ "${enableSwap}" == "yes" ]]; then
+		swapSize="$(((($(vmstat -sS M | grep 'total memory' | sed 's/ M total memory//') / 1024) + 1) * 2))"
+
+		if [[ "${swapSize#}" -gt '32' ]]; then
+			swapSize='32'
+		fi
+
+		sgdisk \
+			-n2:0:+${swapSize}G \
+			-t2:BF02 \
+			-c2:swap \
+			${disk}
+	fi
+
+	sgdisk \
+		-n3:0:0 \
+		-t3:BF00 \
+		-c3:${ID} \
+		${disk}
+elif [[ "${1}" == '--efi' ]]; then
+	if [[ ! "${disk}" == **/dev/disk/by-id/** ]]; then
+		if [[ "${disk}" == **/dev/nvme** ]]; then
+			part1='p1'
+		else
+			part1='1'
+		fi
+	else
+		part1='-part1'
+	fi
 
-if [[ "${*}" == *--efi* ]]; then
 	mkdosfs \
 		-F 32 \
 		-s 1 \