From 18bb941dbc2fc10f4da9f476541624e31e06383d Mon Sep 17 00:00:00 2001
From: Peter Jung <admin@ptr1337.dev>
Date: Wed, 26 Mar 2025 15:11:58 +0100
Subject: [PATCH] Reapply "Update package names"

This reverts commit 9e6bd613e7a825073678ddb934f78dee615b7b63.
---
 .../usr/local/bin/calamares-online.sh         | 28 +++++++++----------
 archiso/packages_desktop.x86_64               |  2 +-
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/archiso/airootfs/usr/local/bin/calamares-online.sh b/archiso/airootfs/usr/local/bin/calamares-online.sh
index d6441f5..071dfdc 100755
--- a/archiso/airootfs/usr/local/bin/calamares-online.sh
+++ b/archiso/airootfs/usr/local/bin/calamares-online.sh
@@ -47,29 +47,29 @@ 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 -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 -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 -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 -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 -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 -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 -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 -Sy cachyos-calamares-qt6-ai
     else
         exit
     fi
diff --git a/archiso/packages_desktop.x86_64 b/archiso/packages_desktop.x86_64
index 304d22e..abff527 100644
--- a/archiso/packages_desktop.x86_64
+++ b/archiso/packages_desktop.x86_64
@@ -15,7 +15,7 @@ brltty
 btrfs-progs
 cachy-browser
 cachy-chroot
-cachyos-calamares-qt6-next-grub
+cachyos-calamares-qt6-grub
 cachyos-cli-installer-new
 cachyos-fish-config
 cachyos-hello