From 0a57fae5911a73a1397ba5d658a84e29cb54d6b2 Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@hey.com>
Date: Thu, 30 Apr 2026 17:28:15 +0200
Subject: [PATCH] Revert "Simplify the migration"

This reverts commit 37b60e550513dc2fce720ee90c1e3345a8f70ba2.
---
 migrations/1777542438.sh | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/migrations/1777542438.sh b/migrations/1777542438.sh
index b15596df..8b1e17cc 100644
--- a/migrations/1777542438.sh
+++ b/migrations/1777542438.sh
@@ -1,7 +1,14 @@
 echo "Replace coterie of individual Elephant packages with the single elephant-all package"
 
 if omarchy-pkg-present omarchy-walker; then
-  omarchy-pkg-drop omarchy-walker
-  omarchy-pkg-add walker elephant-all
-  omarchy-restart-walker
+  sudo pacman -R --noconfirm omarchy-walker
 fi
+
+mapfile -t elephant_packages < <(pacman -Qq | grep '^elephant-' | grep -v '^elephant-all$' || true)
+
+if (( ${#elephant_packages[@]} > 0 )); then
+  sudo pacman -Rns --noconfirm "${elephant_packages[@]}"
+fi
+
+omarchy-pkg-add walker elephant elephant-all
+omarchy-restart-walker