diff --git a/Misc/Arch-LuksCrpy-Install.bash b/Misc/Arch-LuksCrpy-Install.bash index 47005fd..1246dff 100755 --- a/Misc/Arch-LuksCrpy-Install.bash +++ b/Misc/Arch-LuksCrpy-Install.bash @@ -156,7 +156,7 @@ get_available_disks() { list_disks() { local disks disks="${1}" - + local count count=0 log "info" "Available disks" @@ -191,8 +191,8 @@ install() { available_disks="$(get_available_disks)" disk_count="$(get_num_of_elems "${available_disks}")" disk_count=$(( disk_count - 1)) - - + + local disk_selected local install_disk local install_path @@ -202,7 +202,7 @@ install() { while [[ "${valid_disk_selected}" != 0 ]]; do list_disks "${available_disks}" read -p "Select a disk number to install arch linux to: " disk_selected - + if [ ${disk_selected} -eq ${disk_selected} 2> /dev/null ]; then : else @@ -226,12 +226,12 @@ install() { fi done log "info" "Disk selected given as $(important "${install_disk}")" - + if [[ ! -e "${install_path}" ]]; then log "error" "The given disk, $(important "${install_disk}") does not exist at $(important "${install_path}")" exit 1 fi - + if ! confirmation "Begin installation of Arch Linux to $(important "${install_disk}") (y/N)? "; then log "info" "Confirmation recieved negative, going back to options..." exit @@ -267,7 +267,7 @@ install() { mkdfs.fat -F32 "${install_path}" mkfs.ext4 "/dev/mapper/cryptroot" log "info" "Created file systems" - + mount /dev/mapper/cryptroot /mnt mkdir /mnt/boot mount "${install_path}" /mnt/boot @@ -280,7 +280,7 @@ install() { mkswap /mnt/swapfile swapon /mnt/swapfile log "info" "Finished creating swap file" - + local packages packages="base base-devel linux linux-headers linux-firmware neovim" log "info" "Doing primary installation with pacstrap" @@ -336,7 +336,7 @@ __EOF__ grub-install --target=x86_64-efi --efi-directory=/boot --bootloader-id=GRUB grub-mkconfig -o /boot/grub/grub.cfg - + log "info" "Finished installing bootloader" log "info" "Installing network manager"