From fd806fac68679777e292bdba4c044a884a806e46 Mon Sep 17 00:00:00 2001
From: Stuart Hayhurst <stuart.a.hayhurst@gmail.com>
Date: Fri, 12 Jul 2024 20:01:17 +0100
Subject: [PATCH] Don't modify /etc/default/grub anymore, use separate
 configuration files

---
 install.sh | 53 ++++++++++++++++++-----------------------------------
 1 file changed, 18 insertions(+), 35 deletions(-)

diff --git a/install.sh b/install.sh
index 175b2b5..4b9ae23 100755
--- a/install.sh
+++ b/install.sh
@@ -317,26 +317,20 @@ installTheme() {
   #Install splash screen
   cp "$installDir/background.png" "$splashScreenPath"
 
-  #Modify grub config
-  output "success" "Modifiying grub config..."
-  cp -n "/etc/default/grub" "/etc/default/grub.bak"
-
-  updateConfigVal() { #$1: search string, $2: replace string, $3: boolean to append replace string
-    #Replace $1 with $2
-    if grep "$1" /etc/default/grub >/dev/null 2>&1; then
-      sed -i "s|.*$1.*|$2|" /etc/default/grub
-    else
-      #Append $2 if $3 is true and $1 is missing
-      if [[ "$3" == "true" ]]; then
-        echo "$2" >> /etc/default/grub
-      fi
-    fi
-  }
+  #Create GRUB config directory, if it's missing
+  mkdir -p "/etc/default/grub.d/"
+
+  #Handle existing GRUB theme config
+  if [[ -f "/etc/default/grub.d/argon.cfg" ]]; then
+    output "success" "Replacing GRUB theme config..."
+    rm "/etc/default/grub.d/argon.cfg"
+  else
+    output "success" "Installing GRUB theme config..."
+  fi
 
-  updateConfigVal "GRUB_THEME=" "GRUB_THEME=\"$installDir/theme.txt\"" "true"
-  updateConfigVal "GRUB_GFXMODE=" "$gfxmode" "true"
-  updateConfigVal "GRUB_TERMINAL=console" "#GRUB_TERMINAL=console"
-  updateConfigVal "GRUB_TERMINAL_OUTPUT=console" "#GRUB_TERMINAL_OUTPUT=console"
+  #Add relevant config to file
+  echo "GRUB_THEME=\"$installDir/theme.txt\"" > "/etc/default/grub.d/argon.cfg"
+  echo "$gfxmode" >> "/etc/default/grub.d/argon.cfg"
 
   #Update grub config
   updateGrub
@@ -360,23 +354,12 @@ uninstallTheme() {
     rm -rf "$splashScreenPath"
   fi
 
-  #Backup existing grub config
-  output "success" "Modifiying grub config..."
-  cp -n "/etc/default/grub" "/etc/default/grub.bak"
-
-  #Remove GRUB_THEME from config
-  if grep "GRUB_THEME=" /etc/default/grub >/dev/null 2>&1; then
-    #Remove GRUB_THEME
-    sudo sed -i '/GRUB_THEME=/d' /etc/default/grub
+  #Remove GRUB theme config
+  if [[ -f "/etc/default/grub.d/argon.cfg" ]]; then
+    output "success" "Removing GRUB theme config..."
+    rm "/etc/default/grub.d/argon.cfg"
   else
-    output "warning" "  GRUB_THEME not found, restoring original backup..."
-    #Restore grub config backup
-    if [[ -f /etc/default/grub.bak ]]; then
-      mv /etc/default/grub.bak /etc/default/grub
-    else
-      output "error" "No '/etc/default/grub' backup found, exiting"
-      output "warning" "You must manually remove the theme from '/etc/default/grub', then update grub"; exit 1
-    fi
+    output "warning" "GRUB theme config not found, '/etc/default/grub' may need configuring"
   fi
 
   #Update grub config