Easy start script: add manual xstartup choice

This commit is contained in:
Dmitry Maksyoma 2021-07-18 23:30:13 +12:00
parent 66d999beaf
commit bd144b71bf

View File

@ -7,13 +7,15 @@ interface=0.0.0.0
cert_group=ssl-cert cert_group=ssl-cert
xstartup_script=~/.vnc/xstartup xstartup_script=~/.vnc/xstartup
manual_xstartup_choice="Manually edit xstartup"
declare -A all_desktop_environments=( declare -A all_desktop_environments=(
[Cinnamon]=cinnamon-session [Cinnamon]=cinnamon-session
[Mate]="XDG_CURRENT_DESKTOP=MATE dbus-launch --exit-with-session mate-session" [Mate]="XDG_CURRENT_DESKTOP=MATE dbus-launch --exit-with-session mate-session"
[LXDE]=lxsession [Lxqt]=startlxqt [LXDE]=lxsession [Lxqt]=startlxqt
[KDE]=startkde [KDE]=startkde
[Gnome]="XDG_CURRENT_DESKTOP=GNOME dbus-launch --exit-with-session /usr/bin/gnome-session" [Gnome]="XDG_CURRENT_DESKTOP=GNOME dbus-launch --exit-with-session /usr/bin/gnome-session"
[XFCE]=xfce4-session) [XFCE]=xfce4-session
[$manual_xstartup_choice]="")
detected_desktop_environments=() detected_desktop_environments=()
declare -A numbered_desktop_environments declare -A numbered_desktop_environments
@ -36,6 +38,11 @@ print_detected_desktop_environments() {
detect_desktop_environments() { detect_desktop_environments() {
for de_name in "${!all_desktop_environments[@]}"; do for de_name in "${!all_desktop_environments[@]}"; do
if [[ "$de_name" = "$manual_xstartup_choice" ]]; then
detected_desktop_environments+=("$de_name")
continue;
fi
local executable=${all_desktop_environments[$de_name]} local executable=${all_desktop_environments[$de_name]}
executable=($executable) executable=($executable)
executable=${executable[-1]} executable=${executable[-1]}