From 2095ae4ba1a6a6a1e9240b6c7aee67f2aa1024cd Mon Sep 17 00:00:00 2001 From: Peter Jung Date: Mon, 6 Feb 2023 17:21:00 +0100 Subject: [PATCH] Change calamares package name to not break old ISOs Signed-off-by: Peter Jung --- archiso/airootfs/usr/local/bin/calamares-online.sh | 10 +++++----- archiso/packages_gnome.x86_64 | 2 +- archiso/packages_kde.x86_64 | 2 +- archiso/packages_xfce.x86_64 | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/archiso/airootfs/usr/local/bin/calamares-online.sh b/archiso/airootfs/usr/local/bin/calamares-online.sh index da31c8b..43c9a13 100755 --- a/archiso/airootfs/usr/local/bin/calamares-online.sh +++ b/archiso/airootfs/usr/local/bin/calamares-online.sh @@ -59,14 +59,14 @@ 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 -Sy cachyos-calamares-grub + yes | sudo pacman -R cachyos-calamares-next-systemd + yes | sudo pacman -R cachyos-calamares-next-grub + 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 -Sy cachyos-calamares-systemd + yes | sudo pacman -R cachyos-calamares-next-grub + yes | sudo pacman -Sy cachyos-calamares-next-systemd else exit fi diff --git a/archiso/packages_gnome.x86_64 b/archiso/packages_gnome.x86_64 index 84a3f27..0619c7b 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-gnome-settings cachyos-cli-installer-new cachyos-hello diff --git a/archiso/packages_kde.x86_64 b/archiso/packages_kde.x86_64 index 3b0be6b..51f9df0 100644 --- a/archiso/packages_kde.x86_64 +++ b/archiso/packages_kde.x86_64 @@ -15,7 +15,7 @@ brltty broadcom-wl-dkms btrfs-progs cachy-browser -cachyos-calamares-grub +cachyos-calamares-next-grub cachyos-cli-installer-new cachyos-hello cachyos-hooks diff --git a/archiso/packages_xfce.x86_64 b/archiso/packages_xfce.x86_64 index f431c68..1853618 100644 --- a/archiso/packages_xfce.x86_64 +++ b/archiso/packages_xfce.x86_64 @@ -23,7 +23,7 @@ brltty broadcom-wl-dkms btrfs-progs cachy-browser -cachyos-calamares +cachyos-calamares-next-grub cachyos-cli-installer-new cachyos-hello cachyos-hooks