From bdbc376076fbc0350462e3a214ac074defe1aef6 Mon Sep 17 00:00:00 2001 From: Peter Jung Date: Fri, 19 Jan 2024 18:48:25 +0100 Subject: [PATCH] Reapply "Update Package Names" This reverts commit b04f6a47619b896ed62971b09b6c253d3a247e53. Signed-off-by: Peter Jung --- .../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 f75dd53..fb95f5c 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-systemd - yes | sudo pacman -R cachyos-calamares-grub - yes | sudo pacman -R cachyos-calamares-refind - yes | sudo pacman -Sy cachyos-calamares-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 elif [[ "${_exitcode}" -eq 3 ]]; then BOOTLOADER="SYSTEMD-BOOT" echo "USING SYSTEMD-BOOT!" - yes | sudo pacman -R cachyos-calamares-grub - yes | sudo pacman -R cachyos-calamares-refind - yes | sudo pacman -Sy cachyos-calamares-systemd + yes | sudo pacman -R cachyos-calamares-next-grub + yes | sudo pacman -R cachyos-calamares-next-refind + yes | sudo pacman -Sy cachyos-calamares-next-systemd elif [[ "${_exitcode}" -eq 4 ]]; then BOOTLOADER="REFIND" echo "USING REFIND!" - yes | sudo pacman -R cachyos-calamares-grub - yes | sudo pacman -R cachyos-calamares-systemd - yes | sudo pacman -Sy cachyos-calamares-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 else exit fi diff --git a/archiso/packages_gnome.x86_64 b/archiso/packages_gnome.x86_64 index 742ac05..ed4fadf 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-grub +cachyos-calamares-next-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 d52ada8..aa4e88f 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-grub +cachyos-calamares-next-grub cachyos-cli-installer-new cachyos-fish-config cachyos-hello