Removed whitespace
This commit is contained in:
parent
f02c3ba077
commit
e7c61d3c20
@ -156,7 +156,7 @@ get_available_disks() {
|
|||||||
list_disks() {
|
list_disks() {
|
||||||
local disks
|
local disks
|
||||||
disks="${1}"
|
disks="${1}"
|
||||||
|
|
||||||
local count
|
local count
|
||||||
count=0
|
count=0
|
||||||
log "info" "Available disks"
|
log "info" "Available disks"
|
||||||
@ -191,8 +191,8 @@ install() {
|
|||||||
available_disks="$(get_available_disks)"
|
available_disks="$(get_available_disks)"
|
||||||
disk_count="$(get_num_of_elems "${available_disks}")"
|
disk_count="$(get_num_of_elems "${available_disks}")"
|
||||||
disk_count=$(( disk_count - 1))
|
disk_count=$(( disk_count - 1))
|
||||||
|
|
||||||
|
|
||||||
local disk_selected
|
local disk_selected
|
||||||
local install_disk
|
local install_disk
|
||||||
local install_path
|
local install_path
|
||||||
@ -202,7 +202,7 @@ install() {
|
|||||||
while [[ "${valid_disk_selected}" != 0 ]]; do
|
while [[ "${valid_disk_selected}" != 0 ]]; do
|
||||||
list_disks "${available_disks}"
|
list_disks "${available_disks}"
|
||||||
read -p "Select a disk number to install arch linux to: " disk_selected
|
read -p "Select a disk number to install arch linux to: " disk_selected
|
||||||
|
|
||||||
if [ ${disk_selected} -eq ${disk_selected} 2> /dev/null ]; then
|
if [ ${disk_selected} -eq ${disk_selected} 2> /dev/null ]; then
|
||||||
:
|
:
|
||||||
else
|
else
|
||||||
@ -226,12 +226,12 @@ install() {
|
|||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
log "info" "Disk selected given as $(important "${install_disk}")"
|
log "info" "Disk selected given as $(important "${install_disk}")"
|
||||||
|
|
||||||
if [[ ! -e "${install_path}" ]]; then
|
if [[ ! -e "${install_path}" ]]; then
|
||||||
log "error" "The given disk, $(important "${install_disk}") does not exist at $(important "${install_path}")"
|
log "error" "The given disk, $(important "${install_disk}") does not exist at $(important "${install_path}")"
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if ! confirmation "Begin installation of Arch Linux to $(important "${install_disk}") (y/N)? "; then
|
if ! confirmation "Begin installation of Arch Linux to $(important "${install_disk}") (y/N)? "; then
|
||||||
log "info" "Confirmation recieved negative, going back to options..."
|
log "info" "Confirmation recieved negative, going back to options..."
|
||||||
exit
|
exit
|
||||||
@ -267,7 +267,7 @@ install() {
|
|||||||
mkdfs.fat -F32 "${install_path}"
|
mkdfs.fat -F32 "${install_path}"
|
||||||
mkfs.ext4 "/dev/mapper/cryptroot"
|
mkfs.ext4 "/dev/mapper/cryptroot"
|
||||||
log "info" "Created file systems"
|
log "info" "Created file systems"
|
||||||
|
|
||||||
mount /dev/mapper/cryptroot /mnt
|
mount /dev/mapper/cryptroot /mnt
|
||||||
mkdir /mnt/boot
|
mkdir /mnt/boot
|
||||||
mount "${install_path}" /mnt/boot
|
mount "${install_path}" /mnt/boot
|
||||||
@ -280,7 +280,7 @@ install() {
|
|||||||
mkswap /mnt/swapfile
|
mkswap /mnt/swapfile
|
||||||
swapon /mnt/swapfile
|
swapon /mnt/swapfile
|
||||||
log "info" "Finished creating swap file"
|
log "info" "Finished creating swap file"
|
||||||
|
|
||||||
local packages
|
local packages
|
||||||
packages="base base-devel linux linux-headers linux-firmware neovim"
|
packages="base base-devel linux linux-headers linux-firmware neovim"
|
||||||
log "info" "Doing primary installation with pacstrap"
|
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-install --target=x86_64-efi --efi-directory=/boot --bootloader-id=GRUB
|
||||||
grub-mkconfig -o /boot/grub/grub.cfg
|
grub-mkconfig -o /boot/grub/grub.cfg
|
||||||
|
|
||||||
log "info" "Finished installing bootloader"
|
log "info" "Finished installing bootloader"
|
||||||
|
|
||||||
log "info" "Installing network manager"
|
log "info" "Installing network manager"
|
||||||
|
Loading…
Reference in New Issue
Block a user