From 9552da2d28040bfef9a6fd7f7b56a4bebab6607e Mon Sep 17 00:00:00 2001
From: Peter Jung <admin@ptr1337.dev>
Date: Sat, 16 Aug 2025 15:39:30 +0200
Subject: [PATCH] Revert "Reapply "Update package names""

This reverts commit c6352c6c1dff79e6d596331b417888a673bcefb0.
---
 .../usr/local/bin/calamares-online.sh         | 44 +++++++++----------
 archiso/packages_desktop.x86_64               |  2 +-
 2 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/archiso/airootfs/usr/local/bin/calamares-online.sh b/archiso/airootfs/usr/local/bin/calamares-online.sh
index dd8f5b1..de2e3b4 100755
--- a/archiso/airootfs/usr/local/bin/calamares-online.sh
+++ b/archiso/airootfs/usr/local/bin/calamares-online.sh
@@ -51,40 +51,40 @@ Main() {
     if [[ "${_exitcode}" -eq 2 ]]; then
         BOOTLOADER="GRUB"
         echo "USING GRUB!"
-        yes | sudo pacman -R cachyos-calamares-qt6-next-systemd
-        yes | sudo pacman -R cachyos-calamares-qt6-next-grub
-        yes | sudo pacman -R cachyos-calamares-qt6-next-refind
-        yes | sudo pacman -R cachyos-calamares-qt6-next-limine
-        yes | sudo pacman -Sy cachyos-calamares-qt6-next-grub
+        yes | sudo pacman -R cachyos-calamares-qt6-systemd
+        yes | sudo pacman -R cachyos-calamares-qt6-grub
+        yes | sudo pacman -R cachyos-calamares-qt6-refind
+        yes | sudo pacman -R cachyos-calamares-qt6-limine
+        yes | sudo pacman -Sy cachyos-calamares-qt6-grub
     elif [[ "${_exitcode}" -eq 3 ]]; then
         BOOTLOADER="SYSTEMD-BOOT"
         echo "USING SYSTEMD-BOOT!"
-        yes | sudo pacman -R cachyos-calamares-qt6-next-grub
-        yes | sudo pacman -R cachyos-calamares-qt6-next-refind
-        yes | sudo pacman -R cachyos-calamares-qt6-next-limine
-        yes | sudo pacman -Sy cachyos-calamares-qt6-next-systemd
+        yes | sudo pacman -R cachyos-calamares-qt6-grub
+        yes | sudo pacman -R cachyos-calamares-qt6-refind
+        yes | sudo pacman -R cachyos-calamares-qt6-limine
+        yes | sudo pacman -Sy cachyos-calamares-qt6-systemd
     elif [[ "${_exitcode}" -eq 4 ]]; then
         BOOTLOADER="REFIND"
         echo "USING REFIND!"
-        yes | sudo pacman -R cachyos-calamares-qt6-next-grub
-        yes | sudo pacman -R cachyos-calamares-qt6-next-systemd
-        yes | sudo pacman -R cachyos-calamares-qt6-next-limine
-        yes | sudo pacman -Sy cachyos-calamares-qt6-next-refind
+        yes | sudo pacman -R cachyos-calamares-qt6-grub
+        yes | sudo pacman -R cachyos-calamares-qt6-systemd
+        yes | sudo pacman -R cachyos-calamares-qt6-limine
+        yes | sudo pacman -Sy cachyos-calamares-qt6-refind
     elif [[ "${_exitcode}" -eq 5 ]]; then
         BOOTLOADER="AI-SDK/Refind"
         echo "USING AI SDK and Refind!"
-        yes | sudo pacman -R cachyos-calamares-qt6-next-grub
-        yes | sudo pacman -R cachyos-calamares-qt6-next-systemd
-        yes | sudo pacman -R cachyos-calamares-qt6-next-refind
-        yes | sudo pacman -R cachyos-calamares-qt6-next-limine
-        yes | sudo pacman -Sy cachyos-calamares-qt6-next-ai
+        yes | sudo pacman -R cachyos-calamares-qt6-grub
+        yes | sudo pacman -R cachyos-calamares-qt6-systemd
+        yes | sudo pacman -R cachyos-calamares-qt6-refind
+        yes | sudo pacman -R cachyos-calamares-qt6-limine
+        yes | sudo pacman -Sy cachyos-calamares-qt6-ai
     elif [[ "${_exitcode}" -eq 6 ]]; then
         BOOTLOADER="Limine"
         echo "USING Limine"
-        yes | sudo pacman -R cachyos-calamares-qt6-next-grub
-        yes | sudo pacman -R cachyos-calamares-qt6-next-systemd
-        yes | sudo pacman -R cachyos-calamares-qt6-next-refind
-        yes | sudo pacman -Sy cachyos-calamares-qt6-next-limine
+        yes | sudo pacman -R cachyos-calamares-qt6-grub
+        yes | sudo pacman -R cachyos-calamares-qt6-systemd
+        yes | sudo pacman -R cachyos-calamares-qt6-refind
+        yes | sudo pacman -Sy cachyos-calamares-qt6-limine
     else
         exit
     fi
diff --git a/archiso/packages_desktop.x86_64 b/archiso/packages_desktop.x86_64
index 006f795..8c0b35e 100644
--- a/archiso/packages_desktop.x86_64
+++ b/archiso/packages_desktop.x86_64
@@ -14,7 +14,7 @@ breeze-gtk
 brltty
 btrfs-progs
 cachy-chroot
-cachyos-calamares-qt6-next-grub
+cachyos-calamares-qt6-grub
 cachyos-cli-installer-new
 cachyos-fish-config
 cachyos-hello