diff --git a/source/archlabs-installer b/source/archlabs-installer index ab17c4f..39224cf 100755 --- a/source/archlabs-installer +++ b/source/archlabs-installer @@ -15,7 +15,7 @@ # immutable variables { readonly DIST="Archlabs" # Linux distributor -readonly VER="1.6.34" # Installer version +readonly VER="1.6.35" # Installer version readonly LIVE="liveuser" # Live session user readonly TRN="/usr/share/archlabs-installer" # Translation path readonly MNT="/mnt/install" # Install mountpoint @@ -677,7 +677,6 @@ choose_window_manager() { if [[ $WM_NUM -eq 1 ]]; then LOGIN_WM="$INSTALL_WMS" - [[ $INSTALL_WMS == 'gnome' ]] && REMOVE_PKGS="$(pacman -Qssq 'xfce4*')" else LOGIN_WM="$(dialog --cr-wrap --stdout --no-cancel --backtitle "$BT" \ --title " $_WMLogin " --menu "$_WMLoginBody" 0 0 0 $WM_LOGIN_CHOICES)" @@ -1828,6 +1827,10 @@ install_packages() { [[ $LOGIN_TYPE == 'lightdm' ]] && pkgs="$pkgs lightdm lightdm-gtk-greeter lightdm-gtk-greeter-settings accountsservice" [[ $EXTRA_PACKAGES != "" ]] && pkgs="$pkgs $EXTRA_PACKAGES" + if [[ $INSTALL_WMS == 'gnome' ]]; then + REMOVE_PKGS="$(pacman -Qssq 'xfce4*' 2>/dev/null)" + fi + local pkgcmd="pacman -S $pkgs --needed --noconfirm" [[ $REMOVE_PKGS != "" ]] && pkgcmd="pacman -Rns $REMOVE_PKGS --noconfirm ; $pkgcmd"