From dbd54fe35c842313eed7b4e798eb19f992dd38b0 Mon Sep 17 00:00:00 2001
From: Dmitry Maksyoma <ledestin@gmail.com>
Date: Fri, 10 Sep 2021 22:31:48 +1200
Subject: [PATCH] vncserver: add -select-de

---
 unix/vncserver | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/unix/vncserver b/unix/vncserver
index f4e16cc..cde307e 100755
--- a/unix/vncserver
+++ b/unix/vncserver
@@ -728,9 +728,25 @@ sub AskUserToChooseDeOrManualXstartup {
   }
 
   &ForgetSelectedDe();
+
+  $selectDeCmd = &ConstructSelectDeCmd();
   system($selectDeCmd) == 0 || die("Failed to execute $selectDeCmd\n");
 }
 
+sub ConstructSelectDeCmd {
+  my $cmd = "$selectDeBin";
+  my $specifiedDe = $opt{'-select-de'};
+
+  if ($specifiedDe) {
+    $cmd .= " --select-de";
+    if ($specifiedDe != 1) {
+      $cmd .= " $specifiedDe";
+    }
+  }
+
+  $cmd;
+}
+
 sub ForgetSelectedDe {
   unlink $de_was_selected_file;
 }
@@ -1018,7 +1034,7 @@ sub DefineFilePathsAndStuff {
   $vncUserConfig = "$vncUserDir/config";
   $kasmPasswdFile = "$ENV{HOME}/.kasmpasswd";
 
-  $selectDeCmd = "/src/builder/startup/deb/select-de.sh";
+  $selectDeBin = "/src/builder/startup/deb/select-de.sh";
   $de_was_selected_file="$ENV{HOME}/.vnc/.de-was-selected";
 
   $vncSystemConfigDir = "/etc/kasmvnc";