feat(Installer): Add Multi Desktop environnement in the installer to allow the user to choose wich desktop env
This commit is contained in:
+26
-1
@@ -50,7 +50,7 @@ fi
|
||||
# Vérifications
|
||||
# ============================================================
|
||||
command -v pacman >/dev/null || error "pacman introuvable (lance depuis Arch / WSL)"
|
||||
[ "$EUID" -eq 0 ] || exec su -c "bash $0" root
|
||||
[ "$EUID" -eq 0 ] || exec su -c "bash '$0'" root
|
||||
success "Arch Linux (root) ✓"
|
||||
|
||||
SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
|
||||
@@ -120,6 +120,31 @@ for pkg in "${AUR_PACKAGES[@]}"; do
|
||||
su - "$BUILD_USER" -c "git clone https://aur.archlinux.org/${pkg}.git $BUILD_DIR/$pkg" \
|
||||
|| error "Clonage $pkg échoué"
|
||||
|
||||
# Patch spécifique au paquet calamares :
|
||||
# — s'assurer que packagechooser n'est pas dans SKIP_MODULES
|
||||
# — s'assurer que le support Python est activé
|
||||
if [ "$pkg" = "calamares" ]; then
|
||||
info "Patch du PKGBUILD calamares (activation packagechooser)…"
|
||||
|
||||
PKGBUILD_FILE="$BUILD_DIR/$pkg/PKGBUILD"
|
||||
|
||||
# Dépendances de build pour packagechooser
|
||||
pacman -S --needed --noconfirm extra-cmake-modules kcoreaddons ki18n kwidgetsaddons
|
||||
|
||||
# Le PKGBUILD utilise un tableau bash : local _skip_modules=(... packagechooser ...)
|
||||
# On supprime simplement les mots du fichier, quelle que soit la structure.
|
||||
sed -i -E 's/\bpackagechooserq\b[[:space:]]?//g' "$PKGBUILD_FILE"
|
||||
sed -i -E 's/\bpackagechooser\b[[:space:]]?//g' "$PKGBUILD_FILE"
|
||||
|
||||
# Vérification
|
||||
if grep -qE '\bpackagechooser' "$PKGBUILD_FILE"; then
|
||||
warn "packagechooser encore présent dans le PKGBUILD !"
|
||||
grep -n 'packagechooser' "$PKGBUILD_FILE"
|
||||
else
|
||||
success "packagechooser retiré du SKIP_MODULES ✓"
|
||||
fi
|
||||
fi
|
||||
|
||||
info "Build $pkg (peut prendre plusieurs minutes)…"
|
||||
su - "$BUILD_USER" -c "cd $BUILD_DIR/$pkg && makepkg -s --noconfirm" \
|
||||
|| error "Build $pkg échoué"
|
||||
|
||||
Reference in New Issue
Block a user