merge bash rewrite and variable rewrite

.gitignore

@@ -1,3 +1,2 @@
 *.bak
 __pycache__
-config.txt

README.md

@@ -27,4 +27,4 @@ cd artix-installer
 * ISO downloads can be found at [artixlinux.org](https://artixlinux.org/download.php)
 * ISO files can be burned to drives with `dd` or something like Etcher.
 * `sudo dd bs=4M if=/path/to/artix.iso of=/dev/sd[drive letter] status=progress`
-* A better method these days is to use [Ventoy](https://www.ventoy.net/en/index.html)
+* A better method these days is to use [Ventoy](https://www.ventoy.net/en/index.html).

install.sh

@@ -1,23 +1,119 @@
 #!/bin/sh
 
-# preinstall
-yes | sudo pacman -Sy --needed python
+confirm_password () {
+    local pass1="a"
+    local pass2="b"
+    until [[ $pass1 == $pass2 && $pass2 ]]; do
+        printf "$1: " >&2 && read -rs pass1
+        printf "\n" >&2
+        printf "confirm $1: " >&2 && read -rs pass2
+        printf "\n" >&2
+    done
+    echo $pass2
+}
 
-# install
+confirm_name () {
+    local name1="a"
+    local name2="b"
+    until [[ $name1 == $name2 && $name2 ]]; do
+        printf "$1: " >&2 && read name1
+        printf "confirm $1: " >&2 && read name2
+    done
+    echo $name2
+}
+
+# Load keymap
+sudo loadkeys us
+
+# Check boot mode
+[[ ! -d /sys/firmware/efi ]] && printf "Not booted in UEFI mode. Aborting..." && exit 1
+
+# Choose disk
 while :
 do
     sudo fdisk -l
-    printf '\nDisk to install to (e.g. /dev/sda): ' && read MY_DISK
-    if test -b "$MY_DISK"; then
-        echo $MY_DISK
-        break
-    fi
+    printf "\nDisk to install to (e.g. /dev/sda): " && read my_disk
+    [[ -b $my_disk ]] && break
 done
 
-sudo python src/install.py $MY_DISK
-sudo cp src/iamchroot.py /mnt/root/
+part1="$my_disk"1
+part2="$my_disk"2
+part3="$my_disk"3
+if [[ "nvme" == *"$my_disk"* ]]; then
+    part1="$my_disk"p1
+    part2="$my_disk"p2
+    part3="$my_disk"p3
+fi
+
+# Swap size
+printf "Size of swap partition in GiB (4): " && read swap_size
+[[ ! $swap_size ]] && swap_size=4
+
+# Choose filesystem
+until [[ $my_fs == "btrfs" || $my_fs == "ext4" ]]; do
+    printf "Filesystem (btrfs/ext4): " && read my_fs
+    [[ ! $my_fs ]] && my_fs="btrfs"
+done
+
+root_part=$part3
+[[ $my_fs == "ext4" ]] && root_part=$part2
+
+# Encrypt or not
+printf "Encrypt? (Y/n): " && read encrypted
+[[ ! $encrypted ]] && encrypted="y"
+
+my_root="/dev/mapper/root"
+my_swap="/dev/mapper/swap"
+if [[ $encrypted == "n" ]]; then
+    my_root=$part3
+    my_swap=$part2
+    [[ $my_fs == "ext4" ]] && my_root=$part2 && my_swap="/dev/MyVolGrp/swap"
+else
+    cryptpass=$(confirm_password "encryption password")
+fi
+
+# Timezone
+until [[ -f /usr/share/zoneinfo/$region_city ]]; do
+    printf "Region/City (e.g. 'America/Denver'): " && read region_city
+    [[ ! $region_city ]] && region_city="America/Denver"
+done
+
+# Host
+my_hostname=$(confirm_name "hostname")
+
+# Users
+root_password=$(confirm_password "root password")
+
+my_username=$(confirm_name "username")
+user_password=$(confirm_password "user password")
+
+# Microcode
+printf "Microcode (intel/amd/none): " && read ucode
+case ucode in
+    intel)
+        ucode="intel-ucode"
+        ;;
+    amd)
+        ucode="amd-ucode"
+        ;;
+    *)
+        ucode=""
+        ;;
+esac
+
+installvars () {
+    echo my_disk=$my_disk part1=$part1 part2=$part2 part3=$part3 \
+        swap_size=$swap_size my_fs=$my_fs root_part=$root_part encrypted=$encrypted my_root=$my_root my_swap=$my_swap \
+        region_city=$region_city my_hostname=$my_hostname my_username=$my_username \
+        cryptpass=$cryptpass root_password=$root_password user_password=$user_password ucode=$ucode
+}
+
+printf "\nDone with configuration. Installing...\n\n"
 
-# chroot
-sudo artix-chroot /mnt /bin/bash -c "python /root/iamchroot.py $MY_DISK && exit"
+# Install
+sudo $(installvars) sh src/installer.sh
 
-printf '\n`sudo artix-chroot /mnt /bin/bash` back into the system to make any final changes.\n\nYou may now poweroff.\n'
+# Chroot
+sudo cp src/iamchroot.sh /mnt/root/ && \
+    sudo $(installvars) artix-chroot /mnt /bin/bash -c 'sh /root/iamchroot.sh; rm /root/iamchroot.sh; exit' && \
+    printf '\n`sudo artix-chroot /mnt /bin/bash` back into the system to make any final changes.\n\nYou may now poweroff.\n'

src/iamchroot.sh

@@ -0,0 +1,86 @@
+#!/bin/sh
+
+# Boring stuff you should probably do
+ln -sf /usr/share/zoneinfo/$region_city /etc/localtime
+hwclock --systohc
+
+# Localization
+printf "en_US.UTF-8 UTF-8\n" >> /etc/locale.gen
+locale-gen
+printf "LANG=en_US.UTF-8\n" > /etc/locale.conf
+printf "KEYMAP=us\n" > /etc/vconsole.conf
+
+# Host stuff
+printf "$my_hostname\n" > /etc/hostname
+printf "hostname=\"$my_hostname\"\n" > /etc/conf.d/hostname
+printf "\n127.0.0.1\tlocalhost\n::1\t\tlocalhost\n127.0.1.1\t$my_hostname.localdomain\t$my_hostname\n" > /etc/hosts
+
+# Install boot loader
+root_part_uuid=$(blkid $root_part -o value -s UUID)
+
+if [[ $encrypted != "n" ]]; then
+    my_params="cryptdevice=UUID=$(echo $root_part_uuid):root root=\/dev\/mapper\/root"
+    if [[ $my_fs == "ext4" ]]; then
+        my_params="cryptdevice=UUID=$(echo $root_part_uuid):root root=\/dev\/MyVolGrp\/root"
+    fi
+elif [[ $my_fs == "ext4" ]]; then
+    my_params="root=\/dev\/MyVolGrp\/root"
+fi
+
+sed -i "s/^GRUB_CMDLINE_LINUX_DEFAULT.*$/GRUB_CMDLINE_LINUX_DEFAULT=\"$my_params\"/g" /etc/default/grub
+[[ $encrypted != "n" ]] && sed -i '/GRUB_ENABLE_CRYPTODISK=y/s/^#//g' /etc/default/grub
+
+grub-install --target=x86_64-efi --efi-directory=/boot --recheck
+grub-install --target=x86_64-efi --efi-directory=/boot --removable --recheck
+grub-mkconfig -o /boot/grub/grub.cfg
+
+# Local.start
+printf "rfkill unblock wifi\n" > /etc/local.d/local.start
+chmod +x /etc/local.d/local.start
+
+# Add default user
+yes $root_password | passwd
+
+rm /etc/skel/.bash*
+useradd -D -s /bin/zsh
+
+useradd -m $my_username
+
+yes $user_password | passwd $my_username
+usermod -a -G wheel $my_username
+usermod -a -G video $my_username
+usermod -a -G audio $my_username
+
+sed -i '/%wheel ALL=(ALL) ALL/s/^#//g' /etc/sudoers
+
+# Other stuff you should do
+rc-update add connmand default
+
+[[ $my_fs == "ext4" ]] && rc-update add lvm boot
+
+printf "\n$my_swap\t\tswap\t\tswap\t\tsw\t0 0\n" >> /etc/fstab
+
+if [[ $encrypted != "n" && $my_fs == "btrfs" ]]; then
+    swap_uuid=$(blkid $part2 -o value -s UUID)
+
+    printf "run_hook() {\n\tcryptsetup open /dev/disk/by-uuid/$swap_uuid swap\n}\n" > /etc/initcpio/hooks/openswap
+    printf "build() {\n\tadd_runscript\n}\n" > /etc/initcpio/install/openswap
+fi
+
+# Configure mkinitcpio
+if [[ $my_fs == "ext4" ]]; then
+    if [[ $encrypted != "n" ]]; then
+        sed -i 's/^HOOKS.*$/HOOKS=(base udev autodetect keyboard keymap modconf block encrypt lvm2 filesystems fsck)/g' /etc/mkinitcpio.conf
+    else
+        sed -i 's/^HOOKS.*$/HOOKS=(base udev autodetect keyboard keymap modconf block lvm2 filesystems fsck)/g' /etc/mkinitcpio.conf
+    fi
+elif [[ $my_fs == "btrfs" ]]; then
+    sed -i 's/BINARIES=()/BINARIES=(\/usr\/bin\/btrfs)/g' /etc/mkinitcpio.conf
+    if [[ $encrypted != "n" ]]; then
+        sed -i 's/^HOOKS.*$/HOOKS=(base udev autodetect keyboard keymap modconf block encrypt openswap filesystems fsck)/g' /etc/mkinitcpio.conf
+    else
+        sed -i 's/^HOOKS.*$/HOOKS=(base udev autodetect keyboard keymap modconf block filesystems fsck)/g' /etc/mkinitcpio.conf
+    fi
+fi
+
+mkinitcpio -P