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

debian.sh

@@ -54,6 +54,7 @@ openssh-{client,server} \
 popularity-contest \
 printer-driver-all \
 rsync \
+sudo \
 systemd-timesyncd \
 tasksel \
 zfs-initramfs \

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

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
+	umount \
+		-nR \
+		/mnt
 
 	zpool \
 		export \
-		-a
+		${hostname,,}
 fi
 
 if [[ "${1}" == '--host-id' ]]; then