From b04f6a47619b896ed62971b09b6c253d3a247e53 Mon Sep 17 00:00:00 2001
From: Peter Jung <admin@ptr1337.dev>
Date: Sun, 10 Dec 2023 13:49:36 +0100
Subject: [PATCH] Revert "Update Package Names"

This reverts commit bfdf3143ac7c269f38f41420e577e4602aeeb770.
---
 .../usr/local/bin/calamares-online.sh         | 20 +++++++++----------
 archiso/packages_gnome.x86_64                 |  2 +-
 archiso/packages_kde.x86_64                   |  2 +-
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/archiso/airootfs/usr/local/bin/calamares-online.sh b/archiso/airootfs/usr/local/bin/calamares-online.sh
index fb95f5c..f75dd53 100755
--- a/archiso/airootfs/usr/local/bin/calamares-online.sh
+++ b/archiso/airootfs/usr/local/bin/calamares-online.sh
@@ -60,22 +60,22 @@ Main() {
     if [[ "${_exitcode}" -eq 2 ]]; then
         BOOTLOADER="GRUB"
         echo "USING GRUB!"
-        yes | sudo pacman -R cachyos-calamares-next-systemd
-        yes | sudo pacman -R cachyos-calamares-next-grub
-        yes | sudo pacman -R cachyos-calamares-next-refind
-        yes | sudo pacman -Sy cachyos-calamares-next-grub
+        yes | sudo pacman -R cachyos-calamares-systemd
+        yes | sudo pacman -R cachyos-calamares-grub
+        yes | sudo pacman -R cachyos-calamares-refind
+        yes | sudo pacman -Sy cachyos-calamares-grub
     elif [[ "${_exitcode}" -eq 3 ]]; then
         BOOTLOADER="SYSTEMD-BOOT"
         echo "USING SYSTEMD-BOOT!"
-        yes | sudo pacman -R cachyos-calamares-next-grub
-        yes | sudo pacman -R cachyos-calamares-next-refind
-        yes | sudo pacman -Sy cachyos-calamares-next-systemd
+        yes | sudo pacman -R cachyos-calamares-grub
+        yes | sudo pacman -R cachyos-calamares-refind
+        yes | sudo pacman -Sy cachyos-calamares-systemd
     elif [[ "${_exitcode}" -eq 4 ]]; then
         BOOTLOADER="REFIND"
         echo "USING REFIND!"
-        yes | sudo pacman -R cachyos-calamares-next-grub
-        yes | sudo pacman -R cachyos-calamares-next-systemd
-        yes | sudo pacman -Sy cachyos-calamares-next-refind
+        yes | sudo pacman -R cachyos-calamares-grub
+        yes | sudo pacman -R cachyos-calamares-systemd
+        yes | sudo pacman -Sy cachyos-calamares-refind
     else
         exit
     fi
diff --git a/archiso/packages_gnome.x86_64 b/archiso/packages_gnome.x86_64
index ed4fadf..742ac05 100644
--- a/archiso/packages_gnome.x86_64
+++ b/archiso/packages_gnome.x86_64
@@ -19,7 +19,7 @@ brltty
 broadcom-wl-dkms
 btrfs-progs
 cachy-browser
-cachyos-calamares-next-grub
+cachyos-calamares-grub
 cachyos-cli-installer-new
 cachyos-fish-config
 cachyos-gnome-settings
diff --git a/archiso/packages_kde.x86_64 b/archiso/packages_kde.x86_64
index aa4e88f..d52ada8 100644
--- a/archiso/packages_kde.x86_64
+++ b/archiso/packages_kde.x86_64
@@ -14,7 +14,7 @@ brltty
 broadcom-wl-dkms
 btrfs-progs
 cachy-browser
-cachyos-calamares-next-grub
+cachyos-calamares-grub
 cachyos-cli-installer-new
 cachyos-fish-config
 cachyos-hello