my god i hate batch script

EpicGames · Feb 28, 2024 · 178ffc5 · 178ffc5
1 parent 196b808
commit 178ffc5
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 11 deletions.
diff --git a/SignallingWebServer/platform_scripts/cmd/common.bat b/SignallingWebServer/platform_scripts/cmd/common.bat
@@ -39,6 +39,11 @@ set DEFAULT_TURN=0
 set START_TURN=0
 set SERVER_ARGS=
 set FRONTEND_DIR=
+set TURN_SERVER=
+set TURN_USER=
+set TURN_PASS=
+set STUN_SERVER=
+set PUBLIC_IP=
 :arg_loop
 IF NOT "%1"=="" (
     set HANDLED=0

diff --git a/SignallingWebServer/platform_scripts/cmd/start.bat b/SignallingWebServer/platform_scripts/cmd/start.bat
@@ -12,22 +12,23 @@ IF "%CONTINUE%"=="1" (
 	call :SetPublicIP
 	call :SetupTurnStun bg
 
-	set "SERVER_ARGS=%SERVER_ARGS% --serve --https_redirect --public_ip=%PUBLIC_IP%"
-	IF NOT "%STUN_SERVER%"=="" (
-		IF NOT "%TURN_SERVER%"=="" (
-			set PEER_OPTIONS={\\\"iceServers\\\":[{\\\"urls\\\":[\\\"stun:%STUN_SERVER%\\\",\\\"turn:%TURN_SERVER%\\\"],\\\"username\\\":\\\"%TURN_USER%\\\",\\\"credential\\\":\\\"%TURN_PASS%\\\"}]}
+	set PEER_OPTIONS=
+	set SERVER_ARGS=!SERVER_ARGS! --serve --https_redirect --public_ip=!PUBLIC_IP!
+	IF NOT "!STUN_SERVER!"=="" (
+		IF NOT "!TURN_SERVER!"=="" (
+			set PEER_OPTIONS={\\\"iceServers\\\":[{\\\"urls\\\":[\\\"stun:!STUN_SERVER!\\\",\\\"turn:!TURN_SERVER!\\\"],\\\"username\\\":\\\"!TURN_USER!\\\",\\\"credential\\\":\\\"!TURN_PASS!\\\"}]}
 		) ELSE (
-			set PEER_OPTIONS={\\\"iceServers\\\":[{\\\"urls\\\":[\\\"stun:%STUN_SERVER%\\\"]}]}
+			set PEER_OPTIONS={\\\"iceServers\\\":[{\\\"urls\\\":[\\\"stun:!STUN_SERVER!\\\"]}]}
 		)
-	) ELSE IF NOT "%TURN_SERVER%"=="" (
-		set PEER_OPTIONS={\\\"iceServers\\\":[{\\\"urls\\\":[\\\"turn:%TURN_SERVER%\\\"],\\\"username\\\":\\\"%TURN_USER%\\\",\\\"credentials\\\":\\\"%TURN_PASS%\\\"}]}
+	) ELSE IF NOT "!TURN_SERVER!"=="" (
+		set PEER_OPTIONS={\\\"iceServers\\\":[{\\\"urls\\\":[\\\"turn:!TURN_SERVER!\\\"],\\\"username\\\":\\\"!TURN_USER!\\\",\\\"credentials\\\":\\\"!TURN_PASS!\\\"}]}
 	)
 
-	IF NOT "%PEER_OPTIONS%"=="" (
-		set SERVER_ARGS=%SERVER_ARGS% --peer_options=\"%PEER_OPTIONS%\"
+	IF NOT "!PEER_OPTIONS!"=="" (
+		set SERVER_ARGS=!SERVER_ARGS! --peer_options=\"!PEER_OPTIONS!\"
 	)
-	IF NOT "%FRONTEND_DIR%"=="" (
-		set SERVER_ARGS=%SERVER_ARGS% --http_root=\"%FRONTEND_DIR%\"
+	IF NOT "!FRONTEND_DIR!"=="" (
+		set SERVER_ARGS=!SERVER_ARGS! --http_root=\"!FRONTEND_DIR!\"
 	)
 
 	call :PrintConfig