c-ludenberg
b171015d7b
=== Calamares (core) === - Unskip packagechooserq from _skip_modules so it compiles in - pkgrel 2→3 === Calamares Branding === branding.desc: - Blue Antergos color scheme (#4A9EFF accent, #20252B sidebar) - New Antergos logo/icon PNGs from cnchi assets - Larger window (860x540) - Fix sidebar/navigation to widget mode stylesheet.qss: - Blue-themed QSS with gradients, styled buttons/inputs/sidebar show.qml: - 6-slide Calamares slideshow: welcome, EndeavourOS base, DE list, Antergos tools, finishing, thank-you (dark slide) dracut migration: - dracut.conf (NEW): initramfsName for dracut module compatibility - Remove mkinitcpio reference, dracut handles initramfs generation === Online/Offline Installer Split === Problem: unpackfs (GNOME squashfs) + netinstall (selected DE) installs two DEs — wasteful and messy. Solution: Two entirely separate Calamares configurations. settings_offline.conf (NEW): - Traditional unpackfs path, no netinstall steps - Installs GNOME from pre-built squashfs (current behavior) - Used by default `calamares` or via `calamares -c /etc/calamares-offline` settings_online.conf (NEW): - No unpackfs — everything installed from internet via netinstall - netinstall in both show (DE selection) and exec (package install) - Base system + Antergos packages as hidden/immutable groups - Used via `calamares -c /etc/calamares-online` netinstall.yaml (NEW): - Base System (hidden, immutable): kernel, base, firmware, network - Antergos Packages (hidden, immutable): wallpapers, welcome, yay, calamares - 8 Desktop Environments: KDE, GNOME, Xfce, Budgie, Cinnamon, MATE, LXQt, i3/Sway - Hardware Support group: GPU drivers, vulkan, pipewire netinstall.conf (NEW): groupsUrl pointing to netinstall.yaml welcome.conf (NEW): internet check (informational), 8GB storage/2GB RAM/power required calamares-next.sh (NEW): Launcher script — zenity/kdialog/dialog choice between Offline and Online, runs Calamares with the right config. Checks internet connectivity before starting online install. PKGBUILD install layout: - Branding shared at /usr/share/calamares/branding/antergos-next/ - Modules shared at /etc/calamares/modules/ - /etc/calamares-offline/ — settings.conf for offline - /etc/calamares-online/ — settings.conf for online - /etc/calamares/settings.conf → symlink to offline (default) - /usr/bin/calamares-next — launcher script === Antergos Welcome === PKGBUILD: copy data/preferences.json to package root (fixes runtime preferences loading in subdirectory layout)
65 lines
2.1 KiB
Bash
65 lines
2.1 KiB
Bash
#!/bin/bash
|
|
# Antergos NeXT Installer Launcher
|
|
# Presents offline/online choice and launches Calamares with the right config
|
|
|
|
set -e
|
|
|
|
# Prefer zenity (GTK), fall back to dialog (curses)
|
|
if command -v zenity &>/dev/null; then
|
|
DIALOG="zenity"
|
|
elif command -v kdialog &>/dev/null; then
|
|
DIALOG="kdialog"
|
|
else
|
|
DIALOG=""
|
|
fi
|
|
|
|
# Check for internet connectivity
|
|
check_net() {
|
|
ping -c 1 -W 2 archlinux.org &>/dev/null
|
|
}
|
|
|
|
CHOICE=""
|
|
if [ -n "$DIALOG" ]; then
|
|
if [ "$DIALOG" = "zenity" ]; then
|
|
CHOICE=$(zenity --list \
|
|
--title="Antergos NeXT Installer" \
|
|
--text="Choose installation mode:" \
|
|
--width=500 --height=300 \
|
|
--column="Mode" --column="Description" \
|
|
"Offline" "Install GNOME desktop from the live ISO. No internet required." \
|
|
"Online" "Choose a desktop environment and install from the internet.")
|
|
else
|
|
CHOICE=$(kdialog --menu "Antergos NeXT Installer\nChoose installation mode:" \
|
|
"Offline" "Install GNOME desktop from the live ISO. No internet required." \
|
|
"Online" "Choose a desktop environment and install from the internet.")
|
|
fi
|
|
else
|
|
echo "Antergos NeXT Installer"
|
|
echo "======================"
|
|
echo "1) Offline — Install GNOME from ISO (no internet)"
|
|
echo "2) Online — Choose DE and install from internet"
|
|
echo ""
|
|
read -rp "Choice [1]: " n
|
|
case "$n" in
|
|
2|online|Online) CHOICE="Online" ;;
|
|
*) CHOICE="Offline" ;;
|
|
esac
|
|
fi
|
|
|
|
case "$CHOICE" in
|
|
"Online")
|
|
# Online mode: use netinstall for DE selection, no unpackfs
|
|
if ! check_net; then
|
|
if [ -n "$DIALOG" ]; then
|
|
"$DIALOG" --error --text="No internet connection detected.\n\nOnline installation requires a working network connection.\nPlease connect to the internet and try again."
|
|
fi
|
|
exit 1
|
|
fi
|
|
exec calamares -c /etc/calamares-online
|
|
;;
|
|
*)
|
|
# Offline mode: use unpackfs with GNOME squashfs
|
|
exec calamares -c /etc/calamares-offline
|
|
;;
|
|
esac
|