瀏覽代碼

Move display increment to function

bryan 2 年之前
父節點
當前提交
642bb7218f
共有 1 個文件被更改,包括 6 次插入2 次删除
  1. 6 2
      installJRMC

+ 6 - 2
installJRMC

@@ -1354,8 +1354,12 @@ 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
-        return
+        # Allow to increment 10 times before breaking
+        max=$(( DISPLAYNUM + 10 ))
+        while [[ $NEXT_DISPLAYNUM -lt $max ]]; do
+            service_jriver-xvnc
+        done
+        return 1
     else
         echo "Xvnc running on localhost:$PORT"
         openFirewall "jriver-xvnc" "$PORT/tcp"