Fix SCUM lifecycle install path handling
This commit is contained in:
@@ -9,7 +9,7 @@ if "%SERVER_EXECUTABLE_REF%"=="" set "SERVER_EXECUTABLE_REF=SCUM\Binaries\Win64\
|
||||
|
||||
set "STEAMCMD_DIR=%SERVER_ROOT%\steamcmd"
|
||||
set "STEAMCMD_EXE=%STEAMCMD_DIR%\steamcmd.exe"
|
||||
set "SCUM_EXE=%SERVER_ROOT%\%SERVER_EXECUTABLE_REF:/=\%"
|
||||
set "SCUM_EXE_MARKER=%SERVER_ROOT%\.scum-exe-path"
|
||||
|
||||
if not exist "%SERVER_ROOT%" mkdir "%SERVER_ROOT%"
|
||||
if not exist "%STEAMCMD_DIR%" mkdir "%STEAMCMD_DIR%"
|
||||
@@ -27,5 +27,15 @@ set "SCUM_STEAMCMD_RESULT=%ERRORLEVEL%"
|
||||
popd
|
||||
if not "%SCUM_STEAMCMD_RESULT%"=="0" exit /b %SCUM_STEAMCMD_RESULT%
|
||||
|
||||
call :resolve_scum_exe
|
||||
if not exist "%SCUM_EXE%" exit /b 2
|
||||
>"%SCUM_EXE_MARKER%" echo(%SCUM_EXE%
|
||||
exit /b 0
|
||||
|
||||
:resolve_scum_exe
|
||||
set "SCUM_EXE=%SERVER_ROOT%\%SERVER_EXECUTABLE_REF:/=\%"
|
||||
if exist "%SCUM_EXE%" exit /b 0
|
||||
set "SCUM_EXE=%SERVER_ROOT%\steamcmd\steamapps\common\SCUM Server\%SERVER_EXECUTABLE_REF:/=\%"
|
||||
if exist "%SCUM_EXE%" exit /b 0
|
||||
set "SCUM_EXE=%SERVER_ROOT%\SCUM Server\%SERVER_EXECUTABLE_REF:/=\%"
|
||||
exit /b 0
|
||||
|
||||
@@ -7,11 +7,26 @@ 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=%SERVER_ROOT%\%SERVER_EXECUTABLE_REF:/=\%"
|
||||
set "SCUM_EXE_MARKER=%SERVER_ROOT%\.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 not exist "%SCUM_EXE%" call :resolve_scum_exe
|
||||
if not exist "%SCUM_EXE%" exit /b 2
|
||||
|
||||
pushd "%SERVER_ROOT%"
|
||||
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%"
|
||||
|
||||
pushd "%SCUM_WORKDIR%"
|
||||
"%SCUM_EXE%" -port=%SERVER_CREATE_GAMEPORT% -MaxPlayers=%SERVER_CREATE_MAXPLAYERS% %SERVER_LOG_FLAG%
|
||||
set "SCUM_START_RESULT=%ERRORLEVEL%"
|
||||
popd
|
||||
exit /b %SCUM_START_RESULT%
|
||||
|
||||
:resolve_scum_exe
|
||||
set "SCUM_EXE=%SERVER_ROOT%\%SERVER_EXECUTABLE_REF:/=\%"
|
||||
if exist "%SCUM_EXE%" exit /b 0
|
||||
set "SCUM_EXE=%SERVER_ROOT%\steamcmd\steamapps\common\SCUM Server\%SERVER_EXECUTABLE_REF:/=\%"
|
||||
if exist "%SCUM_EXE%" exit /b 0
|
||||
set "SCUM_EXE=%SERVER_ROOT%\SCUM Server\%SERVER_EXECUTABLE_REF:/=\%"
|
||||
exit /b 0
|
||||
|
||||
Reference in New Issue
Block a user