publicWagsHome/KasmVNC
2
0
Fork 0
Code Issues Pull Requests 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
Download Patch File Download Diff File Expand all files Collapse all files

40
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,25 +924,20 @@ sub StartXvncAndRecordPID {
system("$cmd & echo \$! >$pidFile"); system("$cmd & echo \$! >$pidFile");
} }
sub IfXvncDidntStartTryFixingFontPathAndStartXvncAgain { sub StartXvncWithSafeFontPath {
if ($fontPath ne $defFontPath) { if ($fpArgSpecified) {
unless (&IsXvncRunning()) { warn "\nWARNING: The first attempt to start Xvnc failed, probably because the font\n";
if ($fpArgSpecified) { warn "path you specified using the -fp argument is incorrect. Attempting to\n";
warn "\nWARNING: The first attempt to start Xvnc failed, probably because the font\n"; warn "determine an appropriate font path for this system and restart Xvnc using\n";
warn "path you specified using the -fp argument is incorrect. Attempting to\n"; warn "that font path ...\n";
warn "determine an appropriate font path for this system and restart Xvnc using\n"; } else {
warn "that font path ...\n"; warn "\nWARNING: The first attempt to start Xvnc failed, possibly because the font\n";
} else { warn "catalog is not properly configured. Attempting to determine an appropriate\n";
warn "\nWARNING: The first attempt to start Xvnc failed, possibly because the font\n"; warn "font path for this system and restart Xvnc using that font path ...\n";
warn "catalog is not properly configured. Attempting to determine an appropriate\n";
warn "font path for this system and restart Xvnc using that font path ...\n";
}
$cmd =~ s@-fp [^ ]+@@;
$cmd .= " -fp $defFontPath" if ($defFontPath);
&StartXvncAndRecordPID();
&WaitForXvncToStart();
}
} }
$cmd =~ s@-fp [^ ]+@@;
$cmd .= " -fp $defFontPath" if ($defFontPath);
&StartXvncAndRecordPID();
} }
sub IsXvncRunning { sub IsXvncRunning {
@@ -958,3 +956,7 @@ sub WarnUserXvncNotStartedAndExit {
sub WaitForXvncToStart { sub WaitForXvncToStart {
sleep(3); sleep(3);
} }
sub UsingSafeFontPath {
$fontPath eq $defFontPath
}