From 89bb0a394a57ec8f3c14d7d561dbf1d8180450e6 Mon Sep 17 00:00:00 2001
From: natemaia <natemaia10@gmail.com>
Date: Wed, 4 Nov 2020 16:23:10 -0800
Subject: [PATCH] Lower case distro name for boot files

---
 installer | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/installer b/installer
index 1e6bcd1..1252ed6 100755
--- a/installer
+++ b/installer
@@ -234,7 +234,7 @@ declare -A EDIT_FILES=(
 [console]='/etc/vconsole.conf'
 [mkinitcpio]='/etc/mkinitcpio.conf'
 [hostname]='/etc/hostname /etc/hosts'
-[bootloader]="/boot/loader/entries/$DIST.conf"  # ** based on bootloader
+[bootloader]="/boot/loader/entries/${DIST,,}.conf"  # ** based on bootloader
 [locale]='/etc/locale.conf /etc/default/locale'
 [keyboard]='/etc/X11/xorg.conf.d/00-keyboard.conf /etc/default/keyboard'
 ) # }
@@ -905,6 +905,7 @@ select_packages()
 		qpdfview "A tabbed PDF viewer" "$(ofn qpdfview "${USER_PKGS[*]}")" \
 		qt5ct "GUI for managing Qt based application themes, icons, and fonts" "$(ofn qt5ct "${USER_PKGS[*]}")" \
 		qutebrowser "A keyboard-focused vim-like web browser based on Python and PyQt5" "$(ofn qutebrowser "${USER_PKGS[*]}")" \
+		ranger "A simple vim-like file manager" "$(ofn ranger "${USER_PKGS[*]}")" \
 		rhythmbox "A Music playback and management application" "$(ofn rhythmbox "${USER_PKGS[*]}")" \
 		rsync "A file transfer program to keep remote files in sync" "$(ofn rsync "${USER_PKGS[*]}")" \
 		rxvt-unicode "A unicode enabled rxvt-clone terminal emulator" "$(ofn rxvt-unicode "${USER_PKGS[*]}")" \
@@ -1900,8 +1901,8 @@ install_bootldr()
 	if [[ $SYS == 'UEFI' ]]; then
 		# remove our old install and generic BOOT/ dir
 		echo "Removing conflicting boot directories"
-		if [[ -d "$MNT/boot/EFI/$DIST" ]]; then
-			find "$MNT/boot/EFI/" -maxdepth 1 -mindepth 1 -iname "$DIST" -type d -delete -printf "remove %p\n"
+		if [[ -d "$MNT/boot/EFI/${DIST,,}" ]]; then
+			find "$MNT/boot/EFI/" -maxdepth 1 -mindepth 1 -iname "${DIST,,}" -type d -delete -printf "remove %p\n"
 			find "$MNT/boot/EFI/" -maxdepth 1 -mindepth 1 -iname 'BOOT' -type d -delete -printf "remove %p\n"
 		fi
 	fi
@@ -1941,7 +1942,7 @@ install_bootldr()
 		mkdir -pv "$MNT/boot/EFI/BOOT"
 		case "$BOOTLDR" in
 			grub)
-				cp -fv "$MNT/boot/EFI/$DIST/grubx64.efi" "$MNT/boot/EFI/BOOT/BOOTX64.EFI"
+				cp -fv "$MNT/boot/EFI/${DIST,,}/grubx64.efi" "$MNT/boot/EFI/BOOT/BOOTX64.EFI"
 				;;
 			syslinux)
 				cp -rf "$MNT/boot/EFI/syslinux/"* "$MNT/boot/EFI/BOOT/"
@@ -2327,7 +2328,7 @@ setup_grub()
 		BCMDS[grub]="grub-install --verbose --recheck --force --target=i386-pc $BOOT_D"
 	else
 		BCMDS[grub]="mount -t efivarfs efivarfs /sys/firmware/efi/efivars > /dev/null 2>&1
-		grub-install --verbose --recheck --force --target=x86_64-efi --efi-directory=/boot --bootloader-id='$DIST'"
+		grub-install --verbose --recheck --force --target=x86_64-efi --efi-directory=/boot --bootloader-id='${DIST,,}'"
 		grep -q /sys/firmware/efi/efivars /proc/mounts || mount -t efivarfs efivarfs /sys/firmware/efi/efivars > /dev/null 2>&1
 	fi
 
@@ -2398,7 +2399,7 @@ prerun_syslinux()
 	MENU TITLE $DIST Boot Menu
 	MENU BACKGROUND splash.png
 	TIMEOUT 50
-	DEFAULT $DIST
+	DEFAULT ${DIST,,}
 
 	# see: https://www.syslinux.org/wiki/index.php/Comboot/menu.c32
 	MENU WIDTH 78
@@ -2467,7 +2468,7 @@ prerun_refind-efi()
 
 setup_systemd-boot()
 {
-	EDIT_FILES[bootloader]="/boot/loader/entries/$DIST.conf"
+	EDIT_FILES[bootloader]="/boot/loader/entries/${DIST,,}.conf"
 	BCMDS[systemd-boot]="mount -t efivarfs efivarfs /sys/firmware/efi/efivars > /dev/null 2>&1; systemd-machine-id-setup && bootctl --path=/boot install"
 }
 
@@ -2476,19 +2477,19 @@ prerun_systemd-boot()
 	mkdir -pv "$MNT/boot/loader/entries"
 
 	cat > "$MNT/boot/loader/loader.conf" <<- EOF
-	default  $DIST.conf
+	default  ${DIST,,}.conf
 	timeout  5
 	editor   no
 	EOF
 
-	cat > "$MNT/boot/loader/entries/$DIST.conf" <<- EOF
+	cat > "$MNT/boot/loader/entries/${DIST,,}.conf" <<- EOF
 	title   $DIST Linux
 	linux   /vmlinuz-${KERNEL}$([[ $UCODE ]] && printf "\ninitrd  %s" "/$UCODE.img")
 	initrd  /initramfs-$KERNEL.img
 	options root=$ROOT_ID ${LUKS_DEV}${RESUME}rw$([[ $BTRFS_MNT ]] && printf ' %s' "$BTRFS_MNT")
 	EOF
 
-	cat > "$MNT/boot/loader/entries/$DIST-fallback.conf" <<- EOF
+	cat > "$MNT/boot/loader/entries/${DIST,,}-fallback.conf" <<- EOF
 	title   $DIST Linux Fallback
 	linux   /vmlinuz-${KERNEL}$([[ $UCODE ]] && printf "\ninitrd  %s" "/$UCODE.img")
 	initrd  /initramfs-$KERNEL-fallback.img