From e3be5d0771ad4b72d0a50f9ee4564378965880fc Mon Sep 17 00:00:00 2001
From: Matt C <mdc028@bucknell.edu>
Date: Wed, 20 Oct 2021 14:25:35 -0400
Subject: [PATCH] Minor todos noted, and minor fs fix

---
 citrine.internal.sh | 13 +++++++------
 continue.sh         |  4 ++++
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/citrine.internal.sh b/citrine.internal.sh
index ec93fbd..99714ee 100755
--- a/citrine.internal.sh
+++ b/citrine.internal.sh
@@ -104,7 +104,7 @@ echo "EFI=$EFI"
 
 dumptitle="Please confirm"
 if [[ "$EFI" == "yes" ]]; then
-    dump "This PC seems to *have* booted with UEFI. Press enter to confirmor Control+C to cancel"
+    dump "This PC seems to *have* booted with UEFI. Press enter to confirm, or Control+C to cancel"
 else
     dump "This PC seems to *not* have booted with UEFI. Press enter to aknowledge, or press Control+C if this seems wrong."
 fi
@@ -145,7 +145,7 @@ if [[ "$MANUAL" == "no" ]]; then
     else
         if [[ "$EFI" == "yes" ]]; then
             inf "Initializing ${DISK} as EFI"
-            mkfs.vfat ${DISK}1
+            mkfs.vfat -F32 ${DISK}1
             mkfs.ext4 ${DISK}2
             mount ${DISK}2 /mnt
             mkdir -p /mnt/efi
@@ -159,7 +159,7 @@ if [[ "$MANUAL" == "no" ]]; then
 else
     clear
 
-    dumptitle="Read carefully."
+    dumptitle="Read carefully!"
 
     dump "You have chosen manual partitioning.\
     We're going to drop to a shell for you to partition, but first, PLEASE READ these notes.\
@@ -201,16 +201,17 @@ ping -c 1 getcryst.al
 
 if [[ ! "$?" == "0" ]]; then
     dumptitle="Error!"
-    dump "It seems like this system can't reach the internet. Exiting."
+    dump "It seems like this system can't reach the internet. Failing here."
+    umount -l /mnt
     exit 1
 fi
 
 inf "Setting up base Crystal System"
 
-crystalstrap /mnt base linux linux-firmware systemd-sysvcompat networkmanager grub crystal-grub-theme man-db man-pages texinfo nano sudo curl archlinux-keyring neofetch dialog
+crystalstrap /mnt base linux linux-firmware systemd-sysvcompat networkmanager grub crystal-grub-theme man-db man-pages texinfo micro sudo curl archlinux-keyring neofetch dialog
 if [[ ! "$?" == "0" ]]; then
     inf "CrystalStrap had some error. Retrying."
-    crystalstrap /mnt base linux linux-firmware systemd-sysvcompat networkmanager grub crystal-grub-theme man-db man-pages texinfo nano sudo curl archlinux-keyring neofetch dialog
+    crystalstrap /mnt base linux linux-firmware systemd-sysvcompat networkmanager grub crystal-grub-theme man-db man-pages texinfo micro sudo curl archlinux-keyring neofetch dialog
 fi
 
 if [[ "$EFI" == "yes" ]]; then
diff --git a/continue.sh b/continue.sh
index aa7f7a5..bb75b6f 100755
--- a/continue.sh
+++ b/continue.sh
@@ -32,6 +32,8 @@ msgbox(){
 # --------------------------
 
 clear
+
+# TODO: How might we make a list select of timezones?
 TZ="/usr/share/LMAO/XD"
 while [[ ! -f $TZ ]]; do
     msgbox "Pick a time zone (Format: America/New_York , Europe/London, etc)"
@@ -48,6 +50,8 @@ echo "en_US.UTF-8 UTF-8" >> /etc/locale.gen
 echo "LANG=en_US.UTF-8" > /etc/locale.conf
 
 clear
+
+# Todo: List-select of locales somehow
 prompt "Do you need more locales than just en_US? (y/N)"
 echo "MORE=$response"
 MORE="$response"