Updated variable names and casing

install.sh

@@ -29,17 +29,17 @@ source \
 source \
 	"${baseDir}/system.conf"
 
-if [[ ! "${DISK}" == **/dev/disk/by-id/** ]]; then
-	if [[ "${DISK}" == **/dev/nvme** ]]; then
-		PART1='p1'
-		PART2='p2'
+if [[ ! "${disk}" == **/dev/disk/by-id/** ]]; then
+	if [[ "${disk}" == **/dev/nvme** ]]; then
+		part1='p1'
+		part2='p2'
 	else
-		PART1='1'
-		PART2='2'
+		part1='1'
+		part2='2'
 	fi
 else
-	PART1='-part1'
-	PART2='-part2'
+	part1='-part1'
+	part2='-part2'
 fi
 
 if [[ ! -f "/etc/mtab" ]]; then
@@ -60,7 +60,7 @@ if [[ "${ID}" == 'fedora' ]]; then
 nofsck="yes"
 add_dracutmodules+=" zfs "
 omit_dracutmodules+=" btrfs "
-install_items+=" /etc/zfs/keys/${HOSTNAME,,}.key "
+install_items+=" /etc/zfs/keys/${hostname,,}.key "
 EOF
 	else
 		cat <<EOF >/etc/dracut.conf.d/zol.conf
@@ -177,9 +177,9 @@ passwd
 printf \
 	'\033[?47l'
 
-if [[ "${ENABLE_SWAP}" == "yes" ]]; then
+if [[ "${enableSwap}" == "yes" ]]; then
 	printf \
-		"swap\t${DISK}${PART2}\t/dev/random\tswap,cipher=aes-xts-plain64,size=512\n" | \
+		"swap\t${disk}${part2}\t/dev/random\tswap,cipher=aes-xts-plain64,size=512\n" | \
 		tee /etc/crypttab &> /dev/null
 
 	printf \
@@ -215,14 +215,14 @@ fi
 zfs \
 	set \
 	org.zfsbootmenu:commandline='quiet splash rhgb noresume' \
-	${HOSTNAME,,}/ROOT/${ID}
+	${hostname,,}/ROOT/${ID}
 
 if [[ ! "${*}" = *--no-part* ]]; then
 	if [[ ! -z "$(zfs list | grep 'keystore')" ]]; then
 		zfs \
 			set \
-			org.zfsbootmenu:keysource=${HOSTNAME,,}/keystore \
-			${HOSTNAME,,}
+			org.zfsbootmenu:keysource=${hostname,,}/keystore \
+			${hostname,,}
 	fi
 fi
 
@@ -247,6 +247,6 @@ fi
 
 zfs \
 	snapshot \
-	${HOSTNAME,,}/ROOT/${ID}@install
+	${hostname,,}/ROOT/${ID}@install
 
 "${baseDir}/post-inst.sh"