From f3d1d45cce678414ae1ac9d5672774fe6caba4e8 Mon Sep 17 00:00:00 2001
From: Joaquin <ioachim.radu@protonmail.com>
Date: Sun, 16 Apr 2023 19:23:39 +0300
Subject: [PATCH] [bug] Fixing grub EFI install errors

Fixed grub efi install dirs error and also optdeps not being fetched
their dependencies
---
 install | 3 +--
 koffe   | 8 +++++---
 pi.is   | 4 ++--
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/install b/install
index cb419a1..bf1d370 100755
--- a/install
+++ b/install
@@ -30,9 +30,8 @@ mkswap /dev/$pswap
 swapon /dev/$pswap
 pefi=$(whiptail --title "Select the partiton to install EFI to:" --menu "Select the partiton to install EFI to (no disk if you have legacy bios):" 16 78 10 "${parts[@]}" 3>&1 1>&2 2>&3 3>&-)
 mkdir /mnt/boot
-mkdir /mnt/boot/EFI
 mkfs.fat -F32 /dev/$pefi
-mount /dev/$pefi /mnt/boot/EFI
+mount /dev/$pefi /mnt/boot/
 extraparts=$(whiptail --inputbox "If you want to mount any other partition manually, enter the commands here like this: command 1 ; command 2 ; command 3" 0 0 0 3>&1 1>&2 2>&3 3>&-)
 echo $extraparts > coms
 bash coms
diff --git a/koffe b/koffe
index ccec3a5..950cec3 100755
--- a/koffe
+++ b/koffe
@@ -86,6 +86,8 @@ fi
 
 if [ $(whoami) == root ];
 then
+	#updating the database is required for pacman to resolve the latest links to packages
+	pacman -Suy
     mkdir /tmp/koffe/
     mkdir /tmp/koffe/l/
     mkdir /tmp/koffe/n/
@@ -126,7 +128,7 @@ then
 					#ADD OPTIONAL DEPS TO INSTALL LIST
 					pactree -suo $app > /tmp/koffe/with_opt
 					pactree -su $app > /tmp/koffe/wout_opt
-					grep -Fxvf /tmp/koffe/wout_opt /tmp/koffe/with_opt >> /tmp/koffe/rootfs/airootfs/root/install.list
+					prog="$prog $(grep -Fxvf /tmp/koffe/wout_opt /tmp/koffe/with_opt | cut -d ':' -f 1 | cut -d '>' -f 1 | tr '\n' ' ')"
 				fi
             	wget -nc -i /tmp/koffe/l/$app -P /tmp/koffe/rootfs/airootfs/root/pkg/
 			fi
@@ -152,9 +154,9 @@ then
 					#ADD OPTIONAL DEPS TO INSTALL LIST
 					pactree -suo $component > /tmp/koffe/with_opt
 					pactree -su $component > /tmp/koffe/wout_opt
-					grep -Fxvf /tmp/koffe/wout_opt /tmp/koffe/with_opt >> /tmp/koffe/rootfs/airootfs/root/install.list
+					prog="$prog $(grep -Fxvf /tmp/koffe/wout_opt /tmp/koffe/with_opt | cut -d ':' -f 1 | cut -d '>' -f 1 | tr '\n' ' ')"
 				fi
-
+		
             done
             pacman -Spdd --noconfirm - < /tmp/koffe/grtree > /tmp/koffe/grlinks
             wget -nc -i /tmp/koffe/grlinks -P /tmp/koffe/rootfs/airootfs/root/pkg/
diff --git a/pi.is b/pi.is
index 88bb341..3934048 100644
--- a/pi.is
+++ b/pi.is
@@ -41,13 +41,13 @@ archit=$(whiptail --backtitle "Koffe" --title "Architecture selector" --menu "Ch
     if [[ "$archit" == "64" ]]
     then
         mkdir /boot/EFI
-        grub-install --target=x86_64-efi --efi-directory=/boot/EFI
+        grub-install --target=x86_64-efi --efi-directory=/boot/
         grub-mkconfig -o /boot/grub/grub.cfg
     fi
     if [[ "$archit" == "32" ]]
     then
         mkdir /boot/EFI
-        grub-install --target=i386-efi --efi-directory=/boot/EFI
+        grub-install --target=i386-efi --efi-directory=/boot/
         grub-mkconfig -o /boot/grub/grub.cfg
     fi
     fi