extern/KasmVNC
1
0
Fork 0
mirror of https://github.com/kasmtech/KasmVNC.git synced 2025-01-08 15:08:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

vncserver: add -select-de

Browse Source
This commit is contained in:
Dmitry Maksyoma 2021-09-10 22:31:48 +12:00
parent 6287114cbf
commit dbd54fe35c
1 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
unix/vncserver
View File

@ -728,9 +728,25 @@ sub AskUserToChooseDeOrManualXstartup {
} }
&ForgetSelectedDe(); &ForgetSelectedDe();
$selectDeCmd = &ConstructSelectDeCmd();
system($selectDeCmd) == 0 || die("Failed to execute $selectDeCmd\n"); 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 { sub ForgetSelectedDe {
unlink $de_was_selected_file; unlink $de_was_selected_file;
} }
@ -1018,7 +1034,7 @@ sub DefineFilePathsAndStuff {
$vncUserConfig = "$vncUserDir/config"; $vncUserConfig = "$vncUserDir/config";
$kasmPasswdFile = "$ENV{HOME}/.kasmpasswd"; $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"; $de_was_selected_file="$ENV{HOME}/.vnc/.de-was-selected";
$vncSystemConfigDir = "/etc/kasmvnc"; $vncSystemConfigDir = "/etc/kasmvnc";