From 9bc3c70c5ab08fa454fa532472e66081cd3e1fe3 Mon Sep 17 00:00:00 2001
From: natemaia <natemaia10@gmail.com>
Date: Mon, 27 Aug 2018 19:58:55 -0700
Subject: [PATCH] Testing for dual boot setup

---
 src/lib/bootloader.sh | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/lib/bootloader.sh b/src/lib/bootloader.sh
index b72676f..f904524 100644
--- a/src/lib/bootloader.sh
+++ b/src/lib/bootloader.sh
@@ -198,13 +198,15 @@ install_bootloader() {
 
     if [[ $SYS == 'UEFI' ]]; then
         # make sure efivarfs has been mounted
-        mount -o remount,rw -t efivarfs efivarfs /sys/firmware/efi/efivars >/dev/null 2>&1
-        BCMDS[$BOOTLDR]="mount -o remount,rw -t efivarfs efivarfs /sys/firmware/efi/efivars; ${BCMDS[$BOOTLDR]}"
+        mount -o remount,rw -t efivarfs efivarfs $EFI >/dev/null 2>&1
+        BCMDS[$BOOTLDR]="mount -o remount,rw -t efivarfs efivarfs $EFI; ${BCMDS[$BOOTLDR]}"
 
         # remove old boot entries
         local esp="$MNT/boot/efi/EFI/"
         [[ ! -d $MNT/boot/efi/EFI && -d $MNT/boot/EFI ]] && esp="$MNT/boot/EFI/"
-        find $esp -maxdepth 1 -mindepth 1 \( -name '[aA][rR][cC][hH][lL]abs' -o -name '[Bb][oO][oO][tT]' \) -type d -exec rm -rf '{}' \; >/dev/null 2>&1
+        find $esp -maxdepth 1 -mindepth 1 \
+            \( -name '[aA][rR][cC][hH][lL]abs' -o -name '[Bb][oO][oO][tT]' \) \
+            -type d -exec rm -rf '{}' \; >/dev/null 2>&1
     fi
 
     # sets up the bootloader config(s) and ${BCMDS[$BOOTLDR]}