From f046e3340cdc9700296265f4844ddcae4364ed74 Mon Sep 17 00:00:00 2001
From: Dmitry Maksyoma <ledestin@gmail.com>
Date: Sun, 18 Jul 2021 23:30:37 +1200
Subject: [PATCH] Easy start script: remember DE choice

---
 builder/startup/deb/kasmvncserver-easy-start | 22 ++++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/builder/startup/deb/kasmvncserver-easy-start b/builder/startup/deb/kasmvncserver-easy-start
index d1c54c1..2f61b25 100755
--- a/builder/startup/deb/kasmvncserver-easy-start
+++ b/builder/startup/deb/kasmvncserver-easy-start
@@ -6,6 +6,7 @@ display=:10
 interface=0.0.0.0
 cert_group=ssl-cert
 xstartup_script=~/.vnc/xstartup
+de_was_selected_file="$HOME/.vnc/.kasmvncserver-easy-start-de-was-selected"
 
 manual_xstartup_choice="Manually edit xstartup"
 declare -A all_desktop_environments=(
@@ -67,6 +68,14 @@ ask_user_to_choose_de() {
   done
 }
 
+remember_de_choice() {
+  touch "$de_was_selected_file"
+}
+
+de_was_selected() {
+  [[ -f "$de_was_selected_file" ]]
+}
+
 detect_desktop_environment() {
   local de_name="$1"
   local executable="$2"
@@ -141,10 +150,15 @@ if [[ "$action" = "kill" ]]; then
   exit
 fi
 
-detect_desktop_environments
-ask_user_to_choose_de
-debug "You selected $de_name desktop environment"
-setup_de_to_run_via_xstartup
+if ! de_was_selected; then
+  detect_desktop_environments
+  ask_user_to_choose_de
+  debug "You selected $de_name desktop environment"
+  if [[ "$de_name" != "$manual_xstartup_choice" ]]; then
+    setup_de_to_run_via_xstartup
+  fi
+  remember_de_choice
+fi
 
 vncserver $display -interface $interface
 vncserver -kill $display