Move display increment to function

This commit is contained in:
2023-03-24 19:27:51 -04:00
parent 642bb7218f
commit 97f4af8075

View File

@@ -1353,19 +1353,18 @@ service_jriver-xvnc() {
if ! "${ENABLE[@]}" "$SERVICE_NAME"; then if ! "${ENABLE[@]}" "$SERVICE_NAME"; then
err "vncserver failed to start on DISPLAY $NEXT_DISPLAY" err "vncserver failed to start on DISPLAY $NEXT_DISPLAY"
err "Incrementing DISPLAY and retrying"
# Allow to increment 10 times before breaking # Allow to increment 10 times before breaking
max=$(( DISPLAYNUM + 10 )) max=$(( DISPLAYNUM + 10 ))
while [[ $NEXT_DISPLAYNUM -lt $max ]]; do while [[ $NEXT_DISPLAYNUM -lt $max ]]; do
echo "Incrementing DISPLAY and retrying"
service_jriver-xvnc service_jriver-xvnc
done done
return 1
else else
echo "Xvnc running on localhost:$PORT" echo "Xvnc running on localhost:$PORT"
openFirewall "jriver-xvnc" "$PORT/tcp" openFirewall "jriver-xvnc" "$PORT/tcp"
openFirewall "jriver-mediacenter" "52100-52200/tcp" "1900/udp" openFirewall "jriver-mediacenter" "52100-52200/tcp" "1900/udp"
fi
return 0 return 0
fi
} }