From 26d16e306d9abb1863cb251fef851243013bd952 Mon Sep 17 00:00:00 2001
From: Chrysostomus <matti@manjaro.org>
Date: Thu, 4 Apr 2019 23:46:33 +0300
Subject: [PATCH] Adjust order of operations in chroot script

---
 lib/util-base.sh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/lib/util-base.sh b/lib/util-base.sh
index e5e9e1a..f0e0801 100644
--- a/lib/util-base.sh
+++ b/lib/util-base.sh
@@ -438,8 +438,10 @@ pacman -S --noconfirm grub-theme-manjaro" > ${MOUNTPOINT}/usr/bin/grub_installer
     fi
     # If Full disk encryption is used, use a keyfile
     if $fde; then
+        sed -i '/noconfirm grub-theme-manjaro/d' ${MOUNTPOINT}/usr/bin/grub_installer.sh
         echo 'grep -q "^GRUB_ENABLE_CRYPTODISK=y" /etc/default/grub || \
         sed -i "s/#GRUB_ENABLE_CRYPTODISK=y/GRUB_ENABLE_CRYPTODISK=y/" /etc/default/grub' >> ${MOUNTPOINT}/usr/bin/grub_installer.sh
+        echo "pacman -S --noconfirm grub-theme-manjaro" >> ${MOUNTPOINT}/usr/bin/grub_installer.sh
     fi
     #install grub
     arch_chroot "grub_installer.sh" 2>$ERR
@@ -650,8 +652,10 @@ pacman -S --noconfirm grub-theme-manjaro" > ${MOUNTPOINT}/usr/bin/grub_installer
                 fi
                 # If Full disk encryption is used, use a keyfile
                 if $fde; then
+                    sed -i '/noconfirm grub-theme-manjaro/d' ${MOUNTPOINT}/usr/bin/grub_installer.sh
                     echo 'grep -q "^GRUB_ENABLE_CRYPTODISK=y" /etc/default/grub || \
                     sed -i "s/#GRUB_ENABLE_CRYPTODISK=y/GRUB_ENABLE_CRYPTODISK=y/" /etc/default/grub' >> ${MOUNTPOINT}/usr/bin/grub_installer.sh
+                    echo "pacman -S --noconfirm grub-theme-manjaro" >> ${MOUNTPOINT}/usr/bin/grub_installer.sh
                 fi
 
                 # Remove os-prober if not selected