From 7e4c97c3a0d5826bd3eb13b8fae4117f379306b8 Mon Sep 17 00:00:00 2001 From: Peter Jung Date: Thu, 28 Mar 2024 19:49:32 +0100 Subject: [PATCH] Revert "Update Package Names" This reverts commit 0a5a36e50574c8bf266b02ddbbf17b9e7314fdf2. --- .../usr/local/bin/calamares-online.sh | 20 +++++++++---------- archiso/packages_kde.x86_64 | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/archiso/airootfs/usr/local/bin/calamares-online.sh b/archiso/airootfs/usr/local/bin/calamares-online.sh index d67e65c..dce5f8a 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-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 else exit fi diff --git a/archiso/packages_kde.x86_64 b/archiso/packages_kde.x86_64 index 04c637f..7166b3a 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-qt6-next-grub +cachyos-calamares-qt6-grub cachyos-cli-installer-new cachyos-fish-config cachyos-hello