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

vncserver: split IfXvncDidntStartTryFixingFontPathAndStartXvncAgain()

Browse Source
This commit is contained in:
Dmitry Maksyoma 2021-08-02 23:19:36 +12:00
parent 7ee1522143
commit 8f58d9bc92
1 changed files with 21 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
unix/vncserver
View File

@ -114,7 +114,10 @@ $pidFile = "$vncUserDir/$host:$displayNumber.pid";
&StartXvncAndRecordPID(); &StartXvncAndRecordPID();
&WaitForXvncToStart(); &WaitForXvncToStart();
&IfXvncDidntStartTryFixingFontPathAndStartXvncAgain(); if (!&IsXvncRunning() && !&UsingSafeFontPath()) {
&StartXvncWithSafeFontPath();
&WaitForXvncToStart();
}
unless (&IsXvncRunning()) { unless (&IsXvncRunning()) {
&WarnUserXvncNotStartedAndExit(); &WarnUserXvncNotStartedAndExit();
@ -921,9 +924,7 @@ sub StartXvncAndRecordPID {
system("$cmd & echo \$! >$pidFile"); system("$cmd & echo \$! >$pidFile");
} }
sub IfXvncDidntStartTryFixingFontPathAndStartXvncAgain { sub StartXvncWithSafeFontPath {
if ($fontPath ne $defFontPath) {
unless (&IsXvncRunning()) {
if ($fpArgSpecified) { if ($fpArgSpecified) {
warn "\nWARNING: The first attempt to start Xvnc failed, probably because the font\n"; warn "\nWARNING: The first attempt to start Xvnc failed, probably because the font\n";
warn "path you specified using the -fp argument is incorrect. Attempting to\n"; warn "path you specified using the -fp argument is incorrect. Attempting to\n";
@ -937,9 +938,6 @@ sub IfXvncDidntStartTryFixingFontPathAndStartXvncAgain {
$cmd =~ s@-fp [^ ]+@@; $cmd =~ s@-fp [^ ]+@@;
$cmd .= " -fp $defFontPath" if ($defFontPath); $cmd .= " -fp $defFontPath" if ($defFontPath);
&StartXvncAndRecordPID(); &StartXvncAndRecordPID();
&WaitForXvncToStart();
}
}
} }
sub IsXvncRunning { sub IsXvncRunning {
@ -958,3 +956,7 @@ sub WarnUserXvncNotStartedAndExit {
sub WaitForXvncToStart { sub WaitForXvncToStart {
sleep(3); sleep(3);
} }
sub UsingSafeFontPath {
$fontPath eq $defFontPath
}