From 6cdf4a3790ac657c0328bcddda796fc4f1eee7a4 Mon Sep 17 00:00:00 2001
From: Ryan Hughes <ryan@heyoodle.com>
Date: Fri, 7 Nov 2025 14:46:29 -0500
Subject: [PATCH 1/6] Remove any alternative limine.conf files

---
 migrations/1762446739.sh | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 migrations/1762446739.sh

diff --git a/migrations/1762446739.sh b/migrations/1762446739.sh
new file mode 100644
index 00000000..17175aa0
--- /dev/null
+++ b/migrations/1762446739.sh
@@ -0,0 +1,10 @@
+echo "Remove alternative limine.conf files"
+
+if [ ! -f /boot/limine.conf ]; then
+  echo "Error: /boot/limine.conf does not exist. Do not reboot without resolving this issue!"
+  exit 1
+fi
+
+[ -f /boot/EFI/limine/limine.conf ] && sudo rm -f /boot/EFI/limine/limine.conf
+[ -f /boot/EFI/BOOT/limine.conf ] && sudo rm -f /boot/EFI/BOOT/limine.conf
+[ -f /boot/limine/limine.conf ] && sudo rm -f /boot/limine/limine.conf

From 7cd5661f89e30a1d3a575268473a6a08abaaff34 Mon Sep 17 00:00:00 2001
From: Ryan Hughes <ryan@heyoodle.com>
Date: Fri, 7 Nov 2025 14:57:19 -0500
Subject: [PATCH 2/6] Bump version

---
 version | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/version b/version
index 3ad0595a..9cec7165 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-3.1.5
+3.1.6

From 26821c9b3404276d69aad0e80c525bbd7579a451 Mon Sep 17 00:00:00 2001
From: Ryan Hughes <ryan@heyoodle.com>
Date: Fri, 7 Nov 2025 15:04:23 -0500
Subject: [PATCH 3/6] Cleanup on install

---
 install/login/limine-snapper.sh | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/install/login/limine-snapper.sh b/install/login/limine-snapper.sh
index e837b01f..1f00375a 100644
--- a/install/login/limine-snapper.sh
+++ b/install/login/limine-snapper.sh
@@ -78,6 +78,11 @@ term_background_bright: 24283b
 
 EOF
 
+  # Remove the original config file if it's not /boot/limine.conf
+  if [[ "$limine_config" != "/boot/limine.conf" ]] && [[ -f "$limine_config" ]]; then
+    sudo rm "$limine_config"
+  fi
+
 
   # Match Snapper configs if not installing from the ISO
   if [[ -z ${OMARCHY_CHROOT_INSTALL:-} ]]; then

From e263b5d00a256f279cbebf8f743ce74316517791 Mon Sep 17 00:00:00 2001
From: Ryan Hughes <ryan@heyoodle.com>
Date: Fri, 7 Nov 2025 15:09:34 -0500
Subject: [PATCH 4/6] Only run for Limine installs

---
 migrations/1762446739.sh | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/migrations/1762446739.sh b/migrations/1762446739.sh
index 17175aa0..abc82493 100644
--- a/migrations/1762446739.sh
+++ b/migrations/1762446739.sh
@@ -1,10 +1,12 @@
 echo "Remove alternative limine.conf files"
 
-if [ ! -f /boot/limine.conf ]; then
-  echo "Error: /boot/limine.conf does not exist. Do not reboot without resolving this issue!"
-  exit 1
-fi
+if omarchy-cmd-present limine; then
+  if [ ! -f /boot/limine.conf ]; then
+    echo "Error: /boot/limine.conf does not exist. Do not reboot without resolving this issue!"
+    exit 1
+  fi
 
-[ -f /boot/EFI/limine/limine.conf ] && sudo rm -f /boot/EFI/limine/limine.conf
-[ -f /boot/EFI/BOOT/limine.conf ] && sudo rm -f /boot/EFI/BOOT/limine.conf
-[ -f /boot/limine/limine.conf ] && sudo rm -f /boot/limine/limine.conf
+  [ -f /boot/EFI/limine/limine.conf ] && sudo rm -f /boot/EFI/limine/limine.conf
+  [ -f /boot/EFI/BOOT/limine.conf ] && sudo rm -f /boot/EFI/BOOT/limine.conf
+  [ -f /boot/limine/limine.conf ] && sudo rm -f /boot/limine/limine.conf
+fi

From 5192c9b6876223e2713cffeadb211fd2b1ace9e3 Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@hey.com>
Date: Fri, 7 Nov 2025 21:35:41 +0100
Subject: [PATCH 5/6] Ensure successful ending of migration

---
 migrations/1762446739.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/migrations/1762446739.sh b/migrations/1762446739.sh
index abc82493..09123228 100644
--- a/migrations/1762446739.sh
+++ b/migrations/1762446739.sh
@@ -9,4 +9,7 @@ if omarchy-cmd-present limine; then
   [ -f /boot/EFI/limine/limine.conf ] && sudo rm -f /boot/EFI/limine/limine.conf
   [ -f /boot/EFI/BOOT/limine.conf ] && sudo rm -f /boot/EFI/BOOT/limine.conf
   [ -f /boot/limine/limine.conf ] && sudo rm -f /boot/limine/limine.conf
+
+  # Ensure successful exit
+  exit 0
 fi

From f6aa97350eae0570960e6b69522c7b2eaf5f3b26 Mon Sep 17 00:00:00 2001
From: Ryan Hughes <ryan@heyoodle.com>
Date: Fri, 7 Nov 2025 15:33:31 -0500
Subject: [PATCH 6/6] Update to prevent error

---
 migrations/1762446739.sh | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/migrations/1762446739.sh b/migrations/1762446739.sh
index 09123228..37ad3b1b 100644
--- a/migrations/1762446739.sh
+++ b/migrations/1762446739.sh
@@ -6,10 +6,7 @@ if omarchy-cmd-present limine; then
     exit 1
   fi
 
-  [ -f /boot/EFI/limine/limine.conf ] && sudo rm -f /boot/EFI/limine/limine.conf
-  [ -f /boot/EFI/BOOT/limine.conf ] && sudo rm -f /boot/EFI/BOOT/limine.conf
-  [ -f /boot/limine/limine.conf ] && sudo rm -f /boot/limine/limine.conf
-
-  # Ensure successful exit
-  exit 0
+  sudo rm -f /boot/EFI/limine/limine.conf
+  sudo rm -f /boot/EFI/BOOT/limine.conf
+  sudo rm -f /boot/limine/limine.conf
 fi