Commit edb53941 authored by Igor Pecovnik's avatar Igor Pecovnik
Browse files

Merge minimal and default desktop to limit troubles

parent a6d6506e
...@@ -999,14 +999,10 @@ function jobs () ...@@ -999,14 +999,10 @@ function jobs ()
fi fi
;; ;;
"Minimal" ) "Default" )
configure_desktop "--install-recommends" configure_desktop "--install-recommends"
;; ;;
"Default")
configure_desktop "--install-suggests"
;;
"RDP" ) "RDP" )
if [[ -n $(service xrdp status | grep -w active) ]]; then if [[ -n $(service xrdp status | grep -w active) ]]; then
systemctl stop xrdp.service >/dev/null 2>&1 systemctl stop xrdp.service >/dev/null 2>&1
......
...@@ -96,20 +96,11 @@ while true; do ...@@ -96,20 +96,11 @@ while true; do
# desktop # desktop
if [[ -n $DISPLAY_MANAGER ]]; then if [[ -n $DISPLAY_MANAGER ]]; then
LIST+=( "Desktop" "Disable desktop or change login type" ) LIST+=( "Desktop" "Disable desktop or change login type" )
if ! check_if_installed mpv ; then
LIST+=( "Default" "Install desktop with browser and extras" )
fi
else else
if [[ -n $DESKTOP_INSTALLED ]]; then if [[ -n $DESKTOP_INSTALLED ]]; then
LIST+=( "Desktop" "Enable desktop" ) LIST+=( "Desktop" "Enable desktop" )
if ! check_if_installed mpv ; then
LIST+=( "Default" "Install desktop with browser and extras" )
fi
else else
LIST+=( "Minimal" "Install minimal desktop" ) LIST+=( "Default" "Install desktop with browser and extras" )
if ! check_if_installed mpv ; then
LIST+=( "Default" "Install desktop with browser and extras" )
fi
fi fi
fi fi
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment