From cdf13b977326f19c2a94b95659edd11fb2b1e3b9 Mon Sep 17 00:00:00 2001 From: Peter Jung Date: Sat, 19 Nov 2022 15:34:06 +0100 Subject: [PATCH] Rename calamares package to not break existings ISO's online installation Signed-off-by: Peter Jung --- archiso/airootfs/usr/local/bin/calamares-offline.sh | 2 +- archiso/airootfs/usr/local/bin/calamares-online.sh | 10 +++++----- archiso/packages_kde.x86_64 | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/archiso/airootfs/usr/local/bin/calamares-offline.sh b/archiso/airootfs/usr/local/bin/calamares-offline.sh index 6e42da9..16f7282 100755 --- a/archiso/airootfs/usr/local/bin/calamares-offline.sh +++ b/archiso/airootfs/usr/local/bin/calamares-offline.sh @@ -15,7 +15,7 @@ EOF RunInTerminal "tail -f $log" & sudo cp /usr/share/calamares/settings_${mode}.conf /etc/calamares/settings.conf - sudo -E dbus-launch calamares -D6 >> $log + sudo -E dbus-launch calamares -D6 >> $log } Main "$@" diff --git a/archiso/airootfs/usr/local/bin/calamares-online.sh b/archiso/airootfs/usr/local/bin/calamares-online.sh index 7cd207a..b869456 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 - yes | sudo pacman -Sy cachyos-calamares + yes | sudo pacman -R cachyos-calamares-next-systemd + yes | sudo pacman -R cachyos-calamares-next + yes | sudo pacman -Sy cachyos-calamares-next elif [[ "${_exitcode}" -eq 3 ]]; then BOOTLOADER="SYSTEMD-BOOT" echo "USING SYSTEMD-BOOT!" - yes | sudo pacman -R cachyos-calamares - yes | sudo pacman -Sy cachyos-calamares-systemd + yes | sudo pacman -R cachyos-calamares-next + yes | sudo pacman -Sy cachyos-calamares-next-systemd else exit fi diff --git a/archiso/packages_kde.x86_64 b/archiso/packages_kde.x86_64 index 793efc0..7d348bf 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 +cachyos-calamares-next cachyos-cli-installer-new cachyos-hello cachyos-hooks