Fix time zone configuration loop

- Preinstall on the new system the "less" package
- Create the swap file after mounting the root partition

README.md

@@ -18,3 +18,16 @@ $ ./install.sh
 
 The suggested post-install configuration steps are:
 - Configure the keymap for ttys via /etc/vconsole.conf
+
+## End result
+
+The installation scripts follow every step of the
+[Arch Linux installation guide](https://wiki.archlinux.org/title/Installation_guide)
+with no extra steps or modifications.
+
+After the setup finishes you'll have a very basic Arch Linux installation with
+just a root user and the only the necessary base packages installed.
+
+Note:
+- The installed bootloader is GRUB.
+- The network configuration is done with NetworkManager.

chroot.sh

@@ -8,25 +8,21 @@ password=""
 echoerr() { cat <<< "$@" 1>&2; }
 
 # Set the time zone
-while
+while true; do
-    echo "[INFO] Time zone configuration. Type \"list\" to list time zones"
+    echo "[INFO] Time zone configuration."
     read -p "Enter time zone (${timezone}): " input
 
-    if [[ "$input" == "list" ]]; then
+    if [[ -z "$input" ]]; then
-        awk '/^Z/ { print $2 }; /^L/ { print $3 }' /usr/share/zoneinfo/tzdata.zi | sort | less
+        break
-        continue
     fi
 
-    if [[ -n "$input" ]]; then
+    if [[ -f "/usr/share/zoneinfo/${input}" ]]; then
         timezone="$input"
-    fi
+        break
-
+    else
-    if [[ ! -f "/usr/share/zoneinfo/${timezone}" ]]; then
         echoerr "[ERROR] The selected time zone does not exist"
     fi
-
+done
-    [[ ! -f "/usr/share/zoneinfo/${timezone}" ]]
-do true; done
 
 echo "[INFO] Setting ${timezone} as the time zone"
 ln -sf "/usr/share/zoneinfo/${timezone}" /etc/localtime

install.sh

@@ -83,10 +83,6 @@ echo w # Write changes
 
 # TODO: Check if fdisk terminated succesfully
 
-# Swap file
-echo "[INFO] Creating the swap file"
-mkswap -U clear --size 4G --file /mnt/swapfile &>/dev/null
-
 # Format the partitions
 echo "[INFO] Formatting the partitions"
 mkfs.fat -F 32 "${disk}1" &>/dev/null
@@ -98,7 +94,16 @@ mkfs.ext4 "${disk}2" &>/dev/null
 echo "[INFO] Mounting the file systems"
 mount "${disk}2" /mnt
 mount --mkdir "${disk}1" /mnt/boot
-swapon /mnt/swapfile
+
+# Swap file
+echo "[INFO] Swapfile configuration"
+read -p "Enable swap? [Y/n] " input
+
+if [[ "$input" != [Nn]* ]]; then
+    echo "[INFO] Creating the swap file"
+    mkswap -U clear --size 4G --file /mnt/swapfile &>/dev/null
+    swapon /mnt/swapfile
+fi
 
 # TODO: Select the mirrors for faster download speeds
 
@@ -120,8 +125,8 @@ echo "[INFO] Changing root into the new system"
 arch-chroot /mnt bash /chroot.sh
 
 # Unmount partitions
-umount -R /mnt
 swapoff -a
+umount -R /mnt
 
 # Tell the user that it's ok to reboot now
 echo "[INFO] Now you also can say \"I use Arch, BTW\". Reboot when you're ready"