Fix SCUM SteamCMD install retries
This commit is contained in:
@@ -1,18 +1,25 @@
|
||||
@echo off
|
||||
setlocal EnableExtensions
|
||||
setlocal EnableExtensions EnableDelayedExpansion
|
||||
|
||||
if "%SERVER_ROOT%"=="" set "SERVER_ROOT=C:\scumserver"
|
||||
set "SERVER_ROOT_WINDOWS=%SERVER_ROOT:/=\%"
|
||||
if "%SERVER_STEAM_APP_ID%"=="" set "SERVER_STEAM_APP_ID=3792580"
|
||||
if "%SERVER_STEAMCMD_INSTALL_DIR_ARG%"=="" set "SERVER_STEAMCMD_INSTALL_DIR_ARG=+force_install_dir"
|
||||
if "%SERVER_STEAMCMD_UPDATE_ARGS%"=="" set "SERVER_STEAMCMD_UPDATE_ARGS=+login anonymous +app_update 3792580 validate +quit"
|
||||
if "%SERVER_EXECUTABLE_REF%"=="" set "SERVER_EXECUTABLE_REF=SCUM\Binaries\Win64\SCUMServer.exe"
|
||||
if "%SERVER_INSTALL_DIR%"=="" set "SERVER_INSTALL_DIR=%SERVER_ROOT_WINDOWS%"
|
||||
set "SERVER_INSTALL_DIR_WINDOWS=%SERVER_INSTALL_DIR:/=\%"
|
||||
set "SERVER_INSTALL_DIR_STEAM=%SERVER_INSTALL_DIR_WINDOWS:\=/%"
|
||||
if "%SERVER_STEAMCMD_MAX_ATTEMPTS%"=="" set "SERVER_STEAMCMD_MAX_ATTEMPTS=3"
|
||||
if "%SERVER_STEAMCMD_RETRY_SECONDS%"=="" set "SERVER_STEAMCMD_RETRY_SECONDS=30"
|
||||
|
||||
set "STEAMCMD_DIR=%SERVER_ROOT%\steamcmd"
|
||||
set "STEAMCMD_DIR=%SERVER_ROOT_WINDOWS%\steamcmd"
|
||||
set "STEAMCMD_EXE=%STEAMCMD_DIR%\steamcmd.exe"
|
||||
set "SCUM_EXE_MARKER=%SERVER_ROOT%\.scum-exe-path"
|
||||
set "SCUM_EXE_MARKER=%SERVER_ROOT_WINDOWS%\.scum-exe-path"
|
||||
|
||||
if not exist "%SERVER_ROOT%" mkdir "%SERVER_ROOT%"
|
||||
if not exist "%SERVER_ROOT_WINDOWS%" mkdir "%SERVER_ROOT_WINDOWS%"
|
||||
if not exist "%STEAMCMD_DIR%" mkdir "%STEAMCMD_DIR%"
|
||||
if not exist "%SERVER_INSTALL_DIR_WINDOWS%" mkdir "%SERVER_INSTALL_DIR_WINDOWS%"
|
||||
|
||||
if not exist "%STEAMCMD_EXE%" (
|
||||
powershell -NoProfile -ExecutionPolicy Bypass -Command "[Net.ServicePointManager]::SecurityProtocol=[Net.SecurityProtocolType]::Tls12; $zip=Join-Path $env:STEAMCMD_DIR 'steamcmd.zip'; Invoke-WebRequest -Uri 'https://steamcdn-a.akamaihd.net/client/installer/steamcmd.zip' -OutFile $zip; Expand-Archive -Path $zip -DestinationPath $env:STEAMCMD_DIR -Force; Remove-Item $zip -Force"
|
||||
@@ -22,8 +29,14 @@ if not exist "%STEAMCMD_EXE%" (
|
||||
taskkill /IM SCUMServer.exe /F >nul 2>nul
|
||||
|
||||
pushd "%STEAMCMD_DIR%"
|
||||
"%STEAMCMD_EXE%" %SERVER_STEAMCMD_INSTALL_DIR_ARG% "%SERVER_ROOT%" %SERVER_STEAMCMD_UPDATE_ARGS%
|
||||
set "SCUM_STEAMCMD_RESULT=%ERRORLEVEL%"
|
||||
set "SCUM_STEAMCMD_RESULT=1"
|
||||
for /L %%A in (1,1,%SERVER_STEAMCMD_MAX_ATTEMPTS%) do (
|
||||
"%STEAMCMD_EXE%" %SERVER_STEAMCMD_INSTALL_DIR_ARG% "%SERVER_INSTALL_DIR_STEAM%" %SERVER_STEAMCMD_UPDATE_ARGS%
|
||||
set "SCUM_STEAMCMD_RESULT=!ERRORLEVEL!"
|
||||
if "!SCUM_STEAMCMD_RESULT!"=="0" goto steamcmd_done
|
||||
if not "%%A"=="%SERVER_STEAMCMD_MAX_ATTEMPTS%" timeout /T %SERVER_STEAMCMD_RETRY_SECONDS% /NOBREAK >nul
|
||||
)
|
||||
:steamcmd_done
|
||||
popd
|
||||
if not "%SCUM_STEAMCMD_RESULT%"=="0" exit /b %SCUM_STEAMCMD_RESULT%
|
||||
|
||||
@@ -33,9 +46,11 @@ if not exist "%SCUM_EXE%" exit /b 2
|
||||
exit /b 0
|
||||
|
||||
:resolve_scum_exe
|
||||
set "SCUM_EXE=%SERVER_ROOT%\%SERVER_EXECUTABLE_REF:/=\%"
|
||||
set "SCUM_EXE=%SERVER_ROOT_WINDOWS%\%SERVER_EXECUTABLE_REF:/=\%"
|
||||
if exist "%SCUM_EXE%" exit /b 0
|
||||
set "SCUM_EXE=%SERVER_ROOT%\steamcmd\steamapps\common\SCUM Server\%SERVER_EXECUTABLE_REF:/=\%"
|
||||
set "SCUM_EXE=%SERVER_INSTALL_DIR_WINDOWS%\%SERVER_EXECUTABLE_REF:/=\%"
|
||||
if exist "%SCUM_EXE%" exit /b 0
|
||||
set "SCUM_EXE=%SERVER_ROOT%\SCUM Server\%SERVER_EXECUTABLE_REF:/=\%"
|
||||
set "SCUM_EXE=%SERVER_ROOT_WINDOWS%\steamcmd\steamapps\common\SCUM Server\%SERVER_EXECUTABLE_REF:/=\%"
|
||||
if exist "%SCUM_EXE%" exit /b 0
|
||||
set "SCUM_EXE=%SERVER_ROOT_WINDOWS%\SCUM Server\%SERVER_EXECUTABLE_REF:/=\%"
|
||||
exit /b 0
|
||||
|
||||
@@ -2,20 +2,23 @@
|
||||
setlocal EnableExtensions
|
||||
|
||||
if "%SERVER_ROOT%"=="" set "SERVER_ROOT=C:\scumserver"
|
||||
set "SERVER_ROOT_WINDOWS=%SERVER_ROOT:/=\%"
|
||||
if "%SERVER_EXECUTABLE_REF%"=="" set "SERVER_EXECUTABLE_REF=SCUM\Binaries\Win64\SCUMServer.exe"
|
||||
if "%SERVER_INSTALL_DIR%"=="" set "SERVER_INSTALL_DIR=%SERVER_ROOT_WINDOWS%"
|
||||
set "SERVER_INSTALL_DIR_WINDOWS=%SERVER_INSTALL_DIR:/=\%"
|
||||
if "%SERVER_CREATE_GAMEPORT%"=="" set "SERVER_CREATE_GAMEPORT=7779"
|
||||
if "%SERVER_CREATE_MAXPLAYERS%"=="" set "SERVER_CREATE_MAXPLAYERS=128"
|
||||
if "%SERVER_LOG_FLAG%"=="" set "SERVER_LOG_FLAG=-log"
|
||||
|
||||
set "SCUM_EXE_MARKER=%SERVER_ROOT%\.scum-exe-path"
|
||||
set "SCUM_EXE_MARKER=%SERVER_ROOT_WINDOWS%\.scum-exe-path"
|
||||
if exist "%SCUM_EXE_MARKER%" set /p SCUM_EXE=<"%SCUM_EXE_MARKER%"
|
||||
if "%SCUM_EXE%"=="" set "SCUM_EXE=%SERVER_ROOT%\%SERVER_EXECUTABLE_REF:/=\%"
|
||||
if "%SCUM_EXE%"=="" set "SCUM_EXE=%SERVER_ROOT_WINDOWS%\%SERVER_EXECUTABLE_REF:/=\%"
|
||||
if not exist "%SCUM_EXE%" call :resolve_scum_exe
|
||||
if not exist "%SCUM_EXE%" exit /b 2
|
||||
|
||||
for %%I in ("%SCUM_EXE%") do set "SCUM_EXE_DIR=%%~dpI"
|
||||
for %%I in ("%SCUM_EXE_DIR%..\..\..") do set "SCUM_WORKDIR=%%~fI"
|
||||
if not exist "%SCUM_WORKDIR%" set "SCUM_WORKDIR=%SERVER_ROOT%"
|
||||
if not exist "%SCUM_WORKDIR%" set "SCUM_WORKDIR=%SERVER_ROOT_WINDOWS%"
|
||||
|
||||
pushd "%SCUM_WORKDIR%"
|
||||
"%SCUM_EXE%" -port=%SERVER_CREATE_GAMEPORT% -MaxPlayers=%SERVER_CREATE_MAXPLAYERS% %SERVER_LOG_FLAG%
|
||||
@@ -24,9 +27,11 @@ popd
|
||||
exit /b %SCUM_START_RESULT%
|
||||
|
||||
:resolve_scum_exe
|
||||
set "SCUM_EXE=%SERVER_ROOT%\%SERVER_EXECUTABLE_REF:/=\%"
|
||||
set "SCUM_EXE=%SERVER_ROOT_WINDOWS%\%SERVER_EXECUTABLE_REF:/=\%"
|
||||
if exist "%SCUM_EXE%" exit /b 0
|
||||
set "SCUM_EXE=%SERVER_ROOT%\steamcmd\steamapps\common\SCUM Server\%SERVER_EXECUTABLE_REF:/=\%"
|
||||
set "SCUM_EXE=%SERVER_INSTALL_DIR_WINDOWS%\%SERVER_EXECUTABLE_REF:/=\%"
|
||||
if exist "%SCUM_EXE%" exit /b 0
|
||||
set "SCUM_EXE=%SERVER_ROOT%\SCUM Server\%SERVER_EXECUTABLE_REF:/=\%"
|
||||
set "SCUM_EXE=%SERVER_ROOT_WINDOWS%\steamcmd\steamapps\common\SCUM Server\%SERVER_EXECUTABLE_REF:/=\%"
|
||||
if exist "%SCUM_EXE%" exit /b 0
|
||||
set "SCUM_EXE=%SERVER_ROOT_WINDOWS%\SCUM Server\%SERVER_EXECUTABLE_REF:/=\%"
|
||||
exit /b 0
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
"id": "game.scum",
|
||||
"name": "SCUM Server",
|
||||
"description": "First-party SCUM game server operations plugin with platform-mediated lifecycle and companion bridge support.",
|
||||
"version": "0.1.1",
|
||||
"version": "0.1.2",
|
||||
"kind": "game-plugin",
|
||||
"tags": [
|
||||
"scum",
|
||||
|
||||
@@ -202,10 +202,16 @@ describe("plugin manifest validation", () => {
|
||||
expect(installAction).toMatchObject({ executableKey: "bin/scum-install-update.cmd", environment: { SERVER_STEAM_APP_ID: "3792580", SERVER_STEAMCMD_UPDATE_ARGS: "+login anonymous +app_update 3792580 validate +quit" } });
|
||||
expect(startAction).toMatchObject({ executableKey: "bin/scum-start.cmd", environment: { SERVER_LOG_FLAG: "-log" } });
|
||||
expect(installScript).toContain("taskkill /IM SCUMServer.exe /F");
|
||||
expect(installScript).toContain("%SERVER_STEAMCMD_INSTALL_DIR_ARG% \"%SERVER_ROOT%\" %SERVER_STEAMCMD_UPDATE_ARGS%");
|
||||
expect(installScript).toContain("SERVER_ROOT_WINDOWS=%SERVER_ROOT:/=\\%");
|
||||
expect(installScript).toContain("SERVER_INSTALL_DIR=%SERVER_ROOT_WINDOWS%");
|
||||
expect(installScript).toContain("SERVER_INSTALL_DIR_STEAM=%SERVER_INSTALL_DIR_WINDOWS:\\=/%");
|
||||
expect(installScript).toContain("%SERVER_STEAMCMD_INSTALL_DIR_ARG% \"%SERVER_INSTALL_DIR_STEAM%\" %SERVER_STEAMCMD_UPDATE_ARGS%");
|
||||
expect(installScript).toContain("SERVER_STEAMCMD_MAX_ATTEMPTS=3");
|
||||
expect(installScript).toContain("%SERVER_INSTALL_DIR_WINDOWS%\\%SERVER_EXECUTABLE_REF:/=\\%");
|
||||
expect(installScript).toContain("steamcmd\\steamapps\\common\\SCUM Server");
|
||||
expect(installScript).toContain(".scum-exe-path");
|
||||
expect(startScript).toContain(".scum-exe-path");
|
||||
expect(startScript).toContain("%SERVER_INSTALL_DIR_WINDOWS%\\%SERVER_EXECUTABLE_REF:/=\\%");
|
||||
expect(startScript).toContain("steamcmd\\steamapps\\common\\SCUM Server");
|
||||
expect(startScript).toContain("SCUM_WORKDIR");
|
||||
expect(startScript).toContain("-port=%SERVER_CREATE_GAMEPORT% -MaxPlayers=%SERVER_CREATE_MAXPLAYERS% %SERVER_LOG_FLAG%");
|
||||
|
||||
Reference in New Issue
Block a user