From c38a3261a5a35923ad58a28c758c2630a231c67d Mon Sep 17 00:00:00 2001
From: Stuart Hayhurst <stuart.a.hayhurst@gmail.com>
Date: Sun, 18 Oct 2020 10:32:36 +0100
Subject: [PATCH 1/2] Replace grub configs in place if available, preserves
 their position in file

---
 install.sh | 28 +++++++++++++++++++---------
 1 file changed, 19 insertions(+), 9 deletions(-)

diff --git a/install.sh b/install.sh
index 1b21be7..4cca2c3 100755
--- a/install.sh
+++ b/install.sh
@@ -162,21 +162,31 @@ install() {
     # Backup grub config
     cp -an /etc/default/grub /etc/default/grub.bak
 
-    grep "GRUB_THEME=" /etc/default/grub 2>&1 >/dev/null && sed -i '/GRUB_THEME=/d' /etc/default/grub
-    grep "GRUB_GFXMODE=" /etc/default/grub 2>&1 >/dev/null && sed -i '/GRUB_GFXMODE=/d' /etc/default/grub
-
-    # Edit grub config
-    echo "GRUB_THEME=\"${THEME_DIR}/${name}/theme.txt\"" >> /etc/default/grub
+    if grep "GRUB_THEME=" /etc/default/grub 2>&1 >/dev/null; then
+      #Replace GRUB_THEME
+      sed -i "s|.*GRUB_THEME=.*|GRUB_THEME=\"${THEME_DIR}/${name}/theme.txt\"|" /etc/default/grub
+    else
+      #Append GRUB_THEME
+      echo "GRUB_THEME=\"${THEME_DIR}/${name}/theme.txt\"" >> /etc/default/grub
+    fi
 
     # Make sure set the right resolution for grub
     if [[ ${screen} == '1080p' ]]; then
-      echo "GRUB_GFXMODE=1920x1080,auto" >> /etc/default/grub
+      gfxmode="GRUB_GFXMODE=1920x1080,auto"
     elif [[ ${screen} == '1080p_21:9' ]]; then
-      echo "GRUB_GFXMODE=2560x1080,auto" >> /etc/default/grub
+      gfxmode="GRUB_GFXMODE=2560x1080,auto"
     elif [[ ${screen} == '4k' ]]; then
-      echo "GRUB_GFXMODE=3840x2160,auto" >> /etc/default/grub
+      gfxmode="GRUB_GFXMODE=3840x2160,auto"
     elif [[ ${screen} == '2k' ]]; then
-      echo "GRUB_GFXMODE=2560x1440,auto" >> /etc/default/grub
+      gfxmode="GRUB_GFXMODE=2560x1440,auto"
+    fi
+
+    if grep "GRUB_GFXMODE=" /etc/default/grub 2>&1 >/dev/null; then
+      #Replace GRUB_GFXMODE
+      sed -i "s|.*GRUB_GFXMODE=.*|${gfxmode}|" /etc/default/grub
+    else
+      #Append GRUB_GFXMODE
+      echo "${gfxmode}" >> /etc/default/grub
     fi
 
     # Update grub config

From 8786f9f59cc9e2eb39b259510195e5d532f8d219 Mon Sep 17 00:00:00 2001
From: Stuart Hayhurst <stuart.a.hayhurst@gmail.com>
Date: Sun, 18 Oct 2020 10:37:05 +0100
Subject: [PATCH 2/2] Comment out GRUB_TERMINAL=console if present

---
 install.sh | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/install.sh b/install.sh
index 4cca2c3..6057399 100755
--- a/install.sh
+++ b/install.sh
@@ -189,6 +189,11 @@ install() {
       echo "${gfxmode}" >> /etc/default/grub
     fi
 
+    if grep "GRUB_TERMINAL=console" /etc/default/grub 2>&1 >/dev/null; then
+      #Replace GRUB_TERMINAL
+      sed -i "s|.*GRUB_TERMINAL=console.*|#GRUB_TERMINAL=console|" /etc/default/grub
+    fi
+
     # Update grub config
     prompt -i "\n Updating grub config...\n"