From 59d53dbb19174338da8cd489f0df94397f75d96c Mon Sep 17 00:00:00 2001
From: Dmitry Maksyoma <ledestin@gmail.com>
Date: Sat, 31 Jul 2021 00:30:21 +1200
Subject: [PATCH] vncserver: extract AskUserToChooseDeOrManualXstartup()

---
 unix/vncserver | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/unix/vncserver b/unix/vncserver
index 650a039..0e77bdc 100755
--- a/unix/vncserver
+++ b/unix/vncserver
@@ -78,11 +78,6 @@ chop($host = `uname -n`);
 # Create the user's vnc directory if necessary.
 &CreateDotVncDir();
 
-$selectDeCmd = "builder/startup/deb/select-de.sh";
-if (!$skipxstartup) {
-   system($selectDeCmd);
-}
-
 # Find display number.
 if ((@ARGV > 0) && ($ARGV[0] =~ /^:(\d+)$/)) {
     $displayNumber = $1;
@@ -951,3 +946,10 @@ sub CreateDotVncDir {
       }
    }
 }
+
+sub AskUserToChooseDeOrManualXstartup {
+   $selectDeCmd = "builder/startup/deb/select-de.sh";
+   if (!$skipxstartup) {
+      system($selectDeCmd) == 0 || die("Failed to execute $selectDeCmd\n");
+   }
+}