From f03ae6e0f2d3946289ce452c8de17385afbb2d8b Mon Sep 17 00:00:00 2001 From: phga Date: Fri, 11 Mar 2022 21:20:13 +0100 Subject: [PATCH] fix: variable names --- bootstrap.sh | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/bootstrap.sh b/bootstrap.sh index 72c2cae..6d97589 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -12,6 +12,7 @@ do case $opt in done init() { + sleep 1 echo "" echo "+---------------------------+" echo "| Just Some Short Questions |" @@ -93,18 +94,18 @@ EOF [ $MODE == "NVME" ] && suffix="p" || suffix="" if [ "$ENC" == true ]; then - mkfs.fat -I -F 32 -n P_EFI "/dev/$DEV$suffix1" # -I bc of virtual mappings - crypt_create_fs "/dev/$DEV$suffix3" - mkfs.ext2 -L cryptswap "/dev/$DEV$suffixp2" 1M # Otherwise label will be lost after reboot + echo "MAKING CHANGES ON /dev/${DEV}${suffix}1-3" + mkfs.fat -I -F 32 -n P_EFI "/dev/${DEV}${suffix}1" # -I bc of virtual mappings + crypt_create_fs "/dev/${DEV}${suffix}3" + mkfs.ext2 -L cryptswap "/dev/${DEV}${suffix}2" 1M # Otherwise label will be lost after reboot else - mkfs.fat -F 32 -n P_EFI "/dev/$DEV$suffix1" # -I bc of virtual mappings - mkfs.ext4 -L P_ROOT "/dev/$DEV$suffix3" - mkswap -L P_SWAP "/dev/$DEV$suffix2" + echo "MAKING CHANGES ON /dev/${DEV}${suffix}1-3" + mkfs.fat -F 32 -n P_EFI "/dev/${DEV}${suffix}1" # -I bc of virtual mappings + mkfs.ext4 -L P_ROOT "/dev/${DEV}${suffix}3" + mkswap -L P_SWAP "/dev/${DEV}${suffix}2" fi - -ROOT_UUID=$(blkid | grep -Po '/dev/'"$DEV$suffix"'3.* UUID="\K[0-9a-f-]+') -SWAP_UUID=$(blkid | grep -Po '/dev/'"$DEV$suffix"'2.* UUID="\K[0-9a-f-]+') +ROOT_UUID=$(blkid | grep -Po '/dev/'"${DEV}${suffix}"'3.* UUID="\K[0-9a-f-]+') if [ "$ENC" == true ]; then mount /dev/mapper/root /mnt