|
|
|
@ -2181,49 +2181,49 @@ install_manjaro_de_wm() {
|
|
|
|
|
target_desktop="/tmp/profiles/manjaro/xfce/Packages-Desktop"
|
|
|
|
|
overlay="/tmp/profiles/manjaro/xfce/desktop-overlay/"
|
|
|
|
|
profile="/tmp/profiles/manjaro/xfce/profile.conf"
|
|
|
|
|
display-manager="lightdm"
|
|
|
|
|
echo "lightdm" > /tmp/.display-manager
|
|
|
|
|
;;
|
|
|
|
|
kde)
|
|
|
|
|
target_desktop="/tmp/profiles/manjaro/kde/Packages-Desktop"
|
|
|
|
|
overlay="/tmp/profiles/manjaro/kde/desktop-overlay/"
|
|
|
|
|
profile="/tmp/profiles/manjaro/kde/profile.conf"
|
|
|
|
|
display-manager="sddm"
|
|
|
|
|
echo "sddm" > /tmp/.display-manager
|
|
|
|
|
;;
|
|
|
|
|
deepin)
|
|
|
|
|
target_desktop="/tmp/profiles/community/deepin/Packages-Desktop"
|
|
|
|
|
overlay="/tmp/profiles/community/deepin/desktop-overlay/"
|
|
|
|
|
profile="/tmp/profiles/community/deepin/profile.conf"
|
|
|
|
|
display-manager="lightdm"
|
|
|
|
|
echo "lightdm" > /tmp/.display-manager
|
|
|
|
|
;;
|
|
|
|
|
gnome)
|
|
|
|
|
target_desktop="/tmp/profiles/manjaro/gnome/Packages-Desktop"
|
|
|
|
|
overlay="/tmp/profiles/manjaro/gnome/desktop-overlay/"
|
|
|
|
|
profile="/tmp/profiles/manjaro/gnome/profile.conf"
|
|
|
|
|
display-manager="gdm"
|
|
|
|
|
echo "gdm" > /tmp/.display-manager
|
|
|
|
|
;;
|
|
|
|
|
lxqt)
|
|
|
|
|
target_desktop="/tmp/profiles/manjaro/lxqt/Packages-Desktop"
|
|
|
|
|
overlay="/tmp/profiles/manjaro/lxqt/desktop-overlay/"
|
|
|
|
|
profile="/tmp/profiles/manjaro/lxqt/profile.conf"
|
|
|
|
|
display-manager="sddm"
|
|
|
|
|
echo "sddm" > /tmp/.display-manager
|
|
|
|
|
;;
|
|
|
|
|
i3)
|
|
|
|
|
target_desktop="/tmp/profiles/community/i3/Packages-Desktop"
|
|
|
|
|
overlay="/tmp/profiles/community/i3/desktop-overlay/"
|
|
|
|
|
profile="/tmp/profiles/community/i3/profile.conf"
|
|
|
|
|
display-manager="lightdm"
|
|
|
|
|
echo "lightdm" > /tmp/.display-manager
|
|
|
|
|
;;
|
|
|
|
|
bspwm)
|
|
|
|
|
target_desktop="/tmp/profiles/community/bspwm/Packages-Desktop"
|
|
|
|
|
overlay="/tmp/profiles/community/bspwm/desktop-overlay/"
|
|
|
|
|
profile="/tmp/profiles/community/bspwm/profile.conf"
|
|
|
|
|
display-manager=""
|
|
|
|
|
echo "" > /tmp/.display-manager
|
|
|
|
|
;;
|
|
|
|
|
budgie)
|
|
|
|
|
target_desktop="/tmp/profiles/community/budgie/Packages-Desktop"
|
|
|
|
|
overlay="/tmp/profiles/community/budgie/desktop-overlay/"
|
|
|
|
|
profile="/tmp/profiles/community/budgie/profile.conf"
|
|
|
|
|
display-manager="lightdm"
|
|
|
|
|
echo "lightdm" > /tmp/.display-manager
|
|
|
|
|
;;
|
|
|
|
|
cinnamon)
|
|
|
|
|
target_desktop="/tmp/profiles/community/cinnamon/Packages-Desktop"
|
|
|
|
@ -2300,18 +2300,18 @@ install_manjaro_de_wm() {
|
|
|
|
|
check_for_error
|
|
|
|
|
done
|
|
|
|
|
# enable display manager for openrc
|
|
|
|
|
case $display-manager in
|
|
|
|
|
lightdm) sed -i "s/$(grep "DISPLAYMANAGER=" /mnt/etc/conf.d/xdm)/DISPLAYMANAGER=\"lightdm\"/g" /mnt/etc/conf.d/xdm
|
|
|
|
|
arch_chroot "rc-update add xdm default" 2>/tmp/.errlog
|
|
|
|
|
check_for_error
|
|
|
|
|
;;
|
|
|
|
|
sdddm) sed -i "s/$(grep "DISPLAYMANAGER=" /mnt/etc/conf.d/xdm)/DISPLAYMANAGER=\"sddm\"/g" /mnt/etc/conf.d/xdm
|
|
|
|
|
arch_chroot "rc-update add xdm default" 2>/tmp/.errlog
|
|
|
|
|
check_for_error
|
|
|
|
|
;;
|
|
|
|
|
*) echo "No display-manager needed"
|
|
|
|
|
;;
|
|
|
|
|
esac
|
|
|
|
|
if [[ "$(cat /tmp/.display-manager)" == sddm ]]; then
|
|
|
|
|
sed -i "s/$(grep "DISPLAYMANAGER=" /mnt/etc/conf.d/xdm)/DISPLAYMANAGER=\"sddm\"/g" /mnt/etc/conf.d/xdm
|
|
|
|
|
arch_chroot "rc-update add xdm default" 2>/tmp/.errlog
|
|
|
|
|
check_for_error
|
|
|
|
|
elif [[ "$(cat /tmp/.display-manager)" == sddm ]]; then
|
|
|
|
|
sed -i "s/$(grep "DISPLAYMANAGER=" /mnt/etc/conf.d/xdm)/DISPLAYMANAGER=\"lightdm\"/g" /mnt/etc/conf.d/xdm
|
|
|
|
|
arch_chroot "rc-update add xdm default" 2>/tmp/.errlog
|
|
|
|
|
check_for_error
|
|
|
|
|
else
|
|
|
|
|
echo "no display manager was installed"
|
|
|
|
|
sleep 2
|
|
|
|
|
fi
|
|
|
|
|
else
|
|
|
|
|
eval $(grep -e "enable_systemd=" $profile | sed 's/# //g')
|
|
|
|
|
echo "${enable_systemd[@]}" > /tmp/.services
|
|
|
|
@ -2322,19 +2322,19 @@ install_manjaro_de_wm() {
|
|
|
|
|
arch_chroot "systemctl disable pacman-init" 2>/tmp/.errlog
|
|
|
|
|
check_for_error
|
|
|
|
|
# enable display manager for systemd
|
|
|
|
|
case $display-manager in
|
|
|
|
|
lightdm) arch_chroot "systemctl enable lightdm" 2>/tmp/.errlog
|
|
|
|
|
check_for_error
|
|
|
|
|
;;
|
|
|
|
|
sdddm) arch_chroot "systemctl enable sdddm" 2>/tmp/.errlog
|
|
|
|
|
check_for_error
|
|
|
|
|
;;
|
|
|
|
|
gdm) arch_chroot "systemctl enable gdm" 2>/tmp/.errlog
|
|
|
|
|
check_for_error
|
|
|
|
|
;;
|
|
|
|
|
*) echo "No display-manager needed"
|
|
|
|
|
;;
|
|
|
|
|
esac
|
|
|
|
|
if [[ "$(cat /tmp/.display-manager)" == lightdm ]]; then
|
|
|
|
|
arch_chroot "systemctl enable lightdm" 2>/tmp/.errlog
|
|
|
|
|
check_for_error
|
|
|
|
|
elif [[ "$(cat /tmp/.display-manager)" == sddm ]]; then
|
|
|
|
|
arch_chroot "systemctl enable sdddm" 2>/tmp/.errlog
|
|
|
|
|
check_for_error
|
|
|
|
|
elif [[ "$(cat /tmp/.display-manager)" == gdm ]]; then
|
|
|
|
|
arch_chroot "systemctl enable gdm" 2>/tmp/.errlog
|
|
|
|
|
check_for_error
|
|
|
|
|
else
|
|
|
|
|
echo "no display manager was installed"
|
|
|
|
|
sleep 2
|
|
|
|
|
fi
|
|
|
|
|
fi
|
|
|
|
|
# Clear the packages file for installation of "common" packages
|
|
|
|
|
echo "" > ${PACKAGES}
|
|
|
|
|