diff --git a/archlabs-installer b/archlabs-installer index a4b6a5a..9d138b8 100755 --- a/archlabs-installer +++ b/archlabs-installer @@ -7,7 +7,7 @@ # shellcheck disable=SC2086,SC2046,SC2254 -VER=2.1.43 +VER=2.1.44 # default values { @@ -278,7 +278,6 @@ declare -A FS_OPTS=( declare -A LOGIN_PKGS=( [gdm]='gdm' [lightdm]='lightdm lightdm-gtk-greeter lightdm-gtk-greeter-settings accountsservice' -[ly]='archlabs-ly' [sddm]='sddm' [xinit]='xorg-xinit' ) # } @@ -470,7 +469,7 @@ select_login() case $LOGIN_TYPE in gdm|sddm) - EDIT_FILES[login]="" + EDIT_FILES[login]="none" ;; lightdm) LIGHTDM_GREETER='gtk-greeter' @@ -478,7 +477,8 @@ select_login() local txt="\nWith a deepin install you can choose to use their greeter for lightdm\n\nUse the deepin greeter?\n" [[ $INSTALL_WMS == *deepin* ]] && yesno "Greeter" "$txt" && LIGHTDM_GREETER="deepin-greeter" ;; - xinit) EDIT_FILES[login]="/home/$NEWUSER/.xinitrc /home/$NEWUSER/.xprofile" + xinit) + EDIT_FILES[login]="/home/$NEWUSER/.xinitrc /home/$NEWUSER/.xprofile" if (( $(wc -w <<< "$INSTALL_WMS") > 1 )); then dlg LOGIN_WM menu "Session" "$_login" $LOGIN_CHOICES || return 1 LOGIN_WM="${WM_SESSIONS[$LOGIN_WM]}" @@ -1813,14 +1813,7 @@ install_packages() fi if [[ $VM == 'oracle' ]]; then - case "$KERNEL" in - linux) - chrun "pacman -S virtualbox-guest-utils virtualbox-guest-modules-arch --needed --noconfirm" - ;; - *) - chrun "pacman -S ${KERNEL}-headers virtualbox-guest-utils virtualbox-guest-modules-dkms --needed --noconfirm" - ;; - esac + chrun "pacman -S ${KERNEL}-headers virtualbox-guest-utils virtualbox-guest-dkms --needed --noconfirm" fi return 0