From 319ee077aa26b2db9f9aa98bf62e6d2d35b695aa Mon Sep 17 00:00:00 2001
From: bryan <bryanroessler@gmail.com>
Date: Fri, 24 Mar 2023 19:16:11 -0400
Subject: [PATCH] Move display increment to function

---
 installJRMC | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/installJRMC b/installJRMC
index 8d87089..e8e5b2f 100755
--- a/installJRMC
+++ b/installJRMC
@@ -1313,11 +1313,6 @@ service_jriver-xvnc() {
 
     setVNCPass xvnc
 
-    if [[ $# -eq 1 && $1 == "increment" ]]; then
-        NEXT_DISPLAYNUM=$(( DISPLAYNUM + count ))
-        PORT=$(( NEXT_DISPLAYNUM + 5900 ))
-    fi
-
     start_cmd=(
         /usr/bin/vncserver "$NEXT_DISPLAY"
         -geometry 1440x900 
@@ -1359,8 +1354,8 @@ service_jriver-xvnc() {
     if ! "${ENABLE[@]}" "$SERVICE_NAME"; then
         err "vncserver failed to start on DISPLAY $NEXT_DISPLAY"
         err "Incrementing DISPLAY and retrying"
-        service_jriver-xvnc increment
-        return 1
+        service_jriver-xvnc
+        return
     else
         echo "Xvnc running on localhost:$PORT"
         openFirewall "jriver-xvnc" "$PORT/tcp"