Put 'wifiName' variable used by 'nmcli' command inside double quotes

debian.sh

@@ -35,6 +35,7 @@ fi
 
 if [[ "${1}" == '--mmdebstrap' ]]; then
 	packages=(\
+ca-certificates \
 console-setup \
 cryptsetup \
 curl \
@@ -53,6 +54,7 @@ openssh-{client,server} \
 popularity-contest \
 printer-driver-all \
 rsync \
+sudo \
 systemd-timesyncd \
 tasksel \
 zfs-initramfs \

install.sh

@@ -45,8 +45,10 @@ fi
 "${baseDir}/partition.sh" --efi
 
 if [[ "${ID}" == 'debian' ]] || [[ "${ID}" == 'elementary' ]]; then
+	if [[ -e '/usr/bin/os-prober' ]]; then
 		"${baseDir}/debian.sh" --purge-os-prober
 	fi
+fi
 
 if [[ "${ID}" == 'elementary' ]]; then
 	"${baseDir}/elementary.sh" --desktop

menu.sh

@@ -26,10 +26,10 @@ while [[ ! "${option}" == 'Exit' ]]; do
 #################
 
 EOF
-    select option in 'List' 'Configure' 'Pre Install' 'Install' 'WiFi Setup' 'Post Install' 'Finalize' 'Exit'
+    select option in 'List' 'Configure' 'Install' 'Finalize' 'WiFi Setup' 'Exit'
     do
       case "${option}" in
-        'List'|'Configure'|'Pre Install'|'Install'|'WiFi Setup'|'Post Install'|'Finalize'|'Exit')
+        'List'|'Configure'|'Install'|'Finalize'|'WiFi Setup'|'Exit')
           break
           ;;
         *)
@@ -44,16 +44,12 @@ EOF
     "${baseDir}/list.sh"
   elif [[ "${option}" == 'Configure' ]]; then
     "${baseDir}/configure.sh"
-  elif [[ "${option}" == 'Pre Install' ]]; then
-    "${baseDir}/pre-inst.sh"
   elif [[ "${option}" == 'Install' ]]; then
-    "${baseDir}/install.sh"
+    "${baseDir}/pre-inst.sh"
-  elif [[ "${option}" == 'WiFi Setup' ]]; then
-    "${baseDir}/wifi.sh"
-  elif [[ "${option}" == 'Post Install' ]]; then
-    "${baseDir}/post-inst.sh"
   elif [[ "${option}" == 'Finalize' ]]; then
     "${baseDir}/finalize.sh"
+  elif [[ "${option}" == 'WiFi Setup' ]]; then
+    "${baseDir}/wifi.sh"
   fi
 
   printf '\033[?47h\033[2J\033[H'

mount.sh

@@ -0,0 +1,28 @@
+#!/bin/bash
+set -euo pipefail
+
+
+mount \
+	--types proc \
+	proc \
+	/mnt/proc
+
+mount \
+	--types sysfs \
+	sys \
+	/mnt/sys
+
+mount \
+	--bind \
+	/dev \
+	/mnt/dev
+
+mount \
+	--types devpts \
+	pts \
+	/mnt/dev/pts
+
+mount \
+	--types efivarfs \
+	efivarfs \
+	/mnt/sys/firmware/efi/efivars

partition.sh

@@ -46,8 +46,8 @@ if [[ "${1}" == '--disk' ]]; then
 	if [[ "${enableSwap}" == "yes" ]]; then
 		swapSize="$(((($(vmstat -sS M | grep 'total memory' | sed 's/ M total memory//') / 1024) + 1) * 2))"
 
-		if [[ "${swapSize#}" -gt '32' ]]; then
+		if [[ "${swapSize#}" -gt '16' ]]; then
-			swapSize='32'
+			swapSize='16'
 		fi
 
 		sgdisk \
@@ -62,7 +62,9 @@ if [[ "${1}" == '--disk' ]]; then
 		-t3:BF00 \
 		-c3:${ID} \
 		${disk}
-elif [[ "${1}" == '--efi' ]]; then
+fi
+
+if [[ "${1}" == '--efi' ]]; then
 	if [[ ! "${disk}" == **/dev/disk/by-id/** ]]; then
 		if [[ "${disk}" == **/dev/nvme** ]]; then
 			part1='p1'

pre-inst.sh

@@ -84,7 +84,7 @@ elif [[ "${ID}" == 'debian' ]]; then
 	"${baseDir}/debian.sh" --sources
 fi
 
-"${baseDir}/rbind.sh"
+"${baseDir}/mount.sh"
 
 "${baseDir}/host-id.sh"
 

wifi.sh

@@ -35,9 +35,9 @@ nmcli radio wifi on
 nmcli device wifi list
 
 printf "Enter the SSID of the WiFi network you wish to connect to:\n"
-read -r WIFI_NAME
+read -r wifiName
 
-nmcli --ask device wifi connect ${wifiName}
+nmcli --ask device wifi connect "${wifiName}"
 
 cat << EOF
 

zfs.sh

@@ -30,14 +30,14 @@ if [[ "${1}" == '--format' ]]; then
 
 		while [[ ! "${zpoolPassword}" == "${zpoolPasswordVerify}" ]] || [[ -z "${zpoolPassword}" ]] || [[ "${#zpoolPassword}" -lt '8' ]]; do
 			printf \
-				"\nEnter a password to encrypt your root pool (minimum 8 characters):\n"
+				"Enter a password to encrypt your root pool (minimum 8 characters):\n"
 			read \
 				-r \
 				-s \
 				zpoolPassword
 
 			printf \
-				"\nVerify the password to encrypt your root pool:\n"
+				"Verify the password to encrypt your root pool:\n"
 			read \
 				-r \
 				-s \
@@ -45,13 +45,13 @@ if [[ "${1}" == '--format' ]]; then
 
 			if [[ ! "${zpoolPassword}" == "${zpoolPasswordVerify}" ]]; then
 				printf \
-					"ERROR:\tPasswords do not match!\n"
+					"ERROR:\tPasswords do not match!\n\n"
 			elif [[ -z "${zpoolPassword}" ]]; then
 				printf \
-					"ERROR:\tPassword is empty!\n"
+					"ERROR:\tPassword is empty!\n\n"
 			elif [[ "${#zpoolPassword}" -lt '8' ]]; then
 				printf \
-					"ERROR:\tPassword is too short!\n"
+					"ERROR:\tPassword is too short!\n\n"
 			fi
 		done
 
@@ -222,17 +222,13 @@ if [[ "${1}" == '--key' ]]; then
 fi
 
 if [[ "${1}" == '--unmount' ]]; then
-	mount | grep -v zfs | tac | awk '/\/mnt/ {print $3}' | xargs -I {} umount -Rlf {}
-
-	if [[ "${ID}" == 'fedora' ]]; then
 	umount \
 		-nR \
 		/mnt
-	fi
 
 	zpool \
 		export \
-		-a
+		${hostname,,}
 fi
 
 if [[ "${1}" == '--host-id' ]]; then