Rename calamares package to not break existings ISO's online installation

Signed-off-by: Peter Jung <admin@ptr1337.dev>
This commit is contained in:
Peter Jung committed 2022-11-19 15:34:06 +01:00
1 parent 22ef0da2da
commit cdf13b9773
3 files changed
+7 -7

No files matched your search

@@ -15,7 +15,7 @@ EOF
RunInTerminal "tail -f $log" & RunInTerminal "tail -f $log" &
sudo cp /usr/share/calamares/settings_${mode}.conf /etc/calamares/settings.conf 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 "$@" Main "$@"
@@ -59,14 +59,14 @@ Main() {
if [[ "${_exitcode}" -eq 2 ]]; then if [[ "${_exitcode}" -eq 2 ]]; then
BOOTLOADER="GRUB" BOOTLOADER="GRUB"
echo "USING GRUB!" echo "USING GRUB!"
yes | sudo pacman -R cachyos-calamares-systemd yes | sudo pacman -R cachyos-calamares-next-systemd
yes | sudo pacman -R cachyos-calamares yes | sudo pacman -R cachyos-calamares-next
yes | sudo pacman -Sy cachyos-calamares yes | sudo pacman -Sy cachyos-calamares-next
elif [[ "${_exitcode}" -eq 3 ]]; then elif [[ "${_exitcode}" -eq 3 ]]; then
BOOTLOADER="SYSTEMD-BOOT" BOOTLOADER="SYSTEMD-BOOT"
echo "USING SYSTEMD-BOOT!" echo "USING SYSTEMD-BOOT!"
yes | sudo pacman -R cachyos-calamares yes | sudo pacman -R cachyos-calamares-next
yes | sudo pacman -Sy cachyos-calamares-systemd yes | sudo pacman -Sy cachyos-calamares-next-systemd
else else
exit exit
fi fi
+1 -1
View File
@@ -15,7 +15,7 @@ brltty
broadcom-wl-dkms broadcom-wl-dkms
btrfs-progs btrfs-progs
cachy-browser cachy-browser
cachyos-calamares cachyos-calamares-next
cachyos-cli-installer-new cachyos-cli-installer-new
cachyos-hello cachyos-hello
cachyos-hooks cachyos-hooks