From cbf065f5151c6b0eb62e096f0e9259b33e1b9add Mon Sep 17 00:00:00 2001 From: Dan Johansen Date: Wed, 20 Nov 2019 15:39:15 +0100 Subject: [PATCH] make rpi4 use regular sddm instead of sddm-compat --- manjaro-arm-installer | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/manjaro-arm-installer b/manjaro-arm-installer index 03653de..9463ba6 100755 --- a/manjaro-arm-installer +++ b/manjaro-arm-installer @@ -139,15 +139,15 @@ create_install() { info "Installing packages for $EDITION on $DEVICE..." # Install device and editions specific packages $NSPAWN $TMPDIR/root pacman -Syyu base manjaro-system manjaro-release systemd systemd-libs $PKG_DEVICE $PKG_EDITION --noconfirm - if [[ "$DEVICE" = "rpi4" ]]; then - if [[ "$EDITION" = "kde-plasma" ]] || [[ "$EDITION" = "cubocore" ]]; then - $NSPAWN $TMPDIR/root pacman -R sddm sddm-kcm matcha-dynamic-sddm --noconfirm - $NSPAWN $TMPDIR/root pacman -S sddm-compat sddm-kcm matcha-dynamic-sddm --noconfirm - elif [[ "$EDITION" = "lxqt" ]]; then - $NSPAWN $TMPDIR/root pacman -R sddm matcha-dynamic-sddm --noconfirm - $NSPAWN $TMPDIR/root pacman -S sddm-compat matcha-dynamic-sddm --noconfirm - fi - fi + #if [[ "$DEVICE" = "???" ]]; then + #if [[ "$EDITION" = "kde-plasma" ]] || [[ "$EDITION" = "cubocore" ]]; then + #$NSPAWN $TMPDIR/root pacman -R sddm sddm-kcm matcha-dynamic-sddm --noconfirm + #$NSPAWN $TMPDIR/root pacman -S sddm-compat sddm-kcm matcha-dynamic-sddm --noconfirm + #elif [[ "$EDITION" = "lxqt" ]]; then + #$NSPAWN $TMPDIR/root pacman -R sddm matcha-dynamic-sddm --noconfirm + #$NSPAWN $TMPDIR/root pacman -S sddm-compat matcha-dynamic-sddm --noconfirm + #fi + #fi info "Enabling services..." # Enable services