From c6f7d2eff0b2f0f82389e9b7482e33a282eae965 Mon Sep 17 00:00:00 2001
From: Dmitry Maksyoma <ledestin@gmail.com>
Date: Fri, 13 Aug 2021 19:17:30 +1200
Subject: [PATCH] vncserver: refactor

---
 unix/vncserver | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/unix/vncserver b/unix/vncserver
index 95d4e18..3594d6f 100755
--- a/unix/vncserver
+++ b/unix/vncserver
@@ -28,7 +28,7 @@
 use v5.10;
 use Time::HiRes qw (sleep);
 
-&DetectEnvironment();
+&EnsureWeCanRunInThisEnvironment();
 
 &DefineFilePathsAndStuff();
 
@@ -967,10 +967,9 @@ sub PrintKasmUsers {
   warn "\n";
 }
 
-sub DetectEnvironment {
+sub EnsureWeCanRunInThisEnvironment {
   $exedir = &DetectBinariesDir();
   &CheckRequiredDependenciesArePresent();
-  &DetectFontPath();
 }
 
 sub DefineFilePathsAndStuff {
@@ -1005,6 +1004,8 @@ sub DefineFilePathsAndStuff {
     "# alwaysshared\n");
 
   chop($host = `uname -n`);
+
+  &DetectFontPath();
 }
 
 sub ParseAndProcessCliOptions {