update java version scripts

This commit is contained in:
SpikeHD 2022-05-07 17:32:30 -07:00
parent 055abef5ce
commit 67dc692270
2 changed files with 9 additions and 39 deletions

View File

@ -9,14 +9,7 @@ if %errorlevel%==1 (
echo =======================================================================================
echo No version of Java was found!
if %BRANCH% EQU stable (
echo To launch the stable branch server, you must install Java 8
)
if %BRANCH% EQU development (
echo To launch the development branch server, you must install Java 17
)
echo To launch the server, you must install Java 17
echo =======================================================================================
exit /b
@ -35,36 +28,13 @@ for /f "delims=. tokens=1-3" %%v in ("%JAVAVER%") do (
set BUILD=%%x
)
if %BRANCH% EQU stable (
:: Ensure java 8
if %MAJOR% EQU 1 (
if %MINOR% LSS 8 (
:: Ensure java 17
if %MAJOR% NEQ "17" (
echo =======================================================================================
echo !! Java version is less than 8 !!
echo Please download Java 8 to ensure %BRANCH% branch server launches correctly.
echo !! Java version is not 17 !!
echo Please download Java 17 or later to ensure %BRANCH% branch server launches correctly.
echo =======================================================================================
exit /b
)
)
if %MAJOR% NEQ 1 (
echo =======================================================================================
echo !! Java version is not 8 !!
echo Please download Java 8 to ensure %BRANCH% branch server launches correctly.
echo =======================================================================================
exit /b
)
)
if %BRANCH% EQU development (
:: Ensure java 17
if %MAJOR% LSS 17 (
echo =======================================================================================
echo !! Java version is less than 17 !!
echo Please download Java 17 to ensure %BRANCH% branch server launches correctly.
echo =======================================================================================
exit /b
)
)
echo Java version is compatible

View File

@ -19,7 +19,7 @@ powershell Expand-Archive -Path ".\temp\resources.zip" -DestinationPath "%FOLDER
:: Delete old resources folder if there is one there
del /s /q "%FOLDER_NAME%\resources">nul
echo Moving resources to folder...
echo Moving resources to folder (this also takes a bit)...
robocopy "%FOLDER_NAME%\Grasscutter_Resources-main\Resources" "%FOLDER_NAME%\resources" /E /MOVE>nul