bryan/installJRMC
1
0
Fork 0
Code Issues Pull Requests Releases 8 Wiki Activity

Move display increment to function

Browse Source
This commit is contained in:
Bryan Roessler
2023-03-24 19:10:36 -04:00
parent 0f0da1097e
commit fd073092c0
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
installJRMC
View File

@@ -1168,10 +1168,15 @@ setDisplayVars() {
declare -g DISPLAY DISPLAYNUM NEXT_DISPLAY NEXT_DISPLAYNUM declare -g DISPLAY DISPLAYNUM NEXT_DISPLAY NEXT_DISPLAYNUM
# Check USER_DISPLAY, else environment DISPLAY, else set to :0 # Check USER_DISPLAY, else environment DISPLAY, else set to :0
DISPLAY="${USER_DISPLAY:-${DISPLAY:-0}}" DISPLAY="${USER_DISPLAY:-${DISPLAY:-:0}}"
DISPLAYNUM="${DISPLAY#*:}" # strip prefix DISPLAYNUM="${DISPLAY#*:}" # strip prefix
DISPLAYNUM="${DISPLAYNUM%%.*}" # strip suffix DISPLAYNUM="${DISPLAYNUM%%.*}" # strip suffix
NEXT_DISPLAYNUM=$(( DISPLAYNUM + 1 )) # Increment each time we run this
if (( NEXT_DISPLAYNUM )); then
NEXT_DISPLAYNUM=$(( NEXT_DISPLAYNUM + 1 ))
else
NEXT_DISPLAYNUM=$(( DISPLAYNUM + 1 ))
fi
NEXT_DISPLAY=":$NEXT_DISPLAYNUM" NEXT_DISPLAY=":$NEXT_DISPLAYNUM"
} }
@@ -1309,7 +1314,6 @@ service_jriver-xvnc() {
setVNCPass xvnc setVNCPass xvnc
if [[ $# -eq 1 && $1 == "increment" ]]; then if [[ $# -eq 1 && $1 == "increment" ]]; then
count+=1
NEXT_DISPLAYNUM=$(( DISPLAYNUM + count )) NEXT_DISPLAYNUM=$(( DISPLAYNUM + count ))
PORT=$(( NEXT_DISPLAYNUM + 5900 )) PORT=$(( NEXT_DISPLAYNUM + 5900 ))
fi fi