From 3b99a946540753adb5864ed1448bf0052269dc66 Mon Sep 17 00:00:00 2001 From: OMGeeky <> Date: Tue, 23 Sep 2025 19:29:28 +0200 Subject: [PATCH] add comments to start script about min required java version; update nsi script to match standalone start script --- packaging/Windows/ATCS_Installer.nsi | 8 ++++---- packaging/common/ATCS.cmd | 2 ++ packaging/common/ATCS.sh | 8 +++++--- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/packaging/Windows/ATCS_Installer.nsi b/packaging/Windows/ATCS_Installer.nsi index b671470..85e6ad7 100644 --- a/packaging/Windows/ATCS_Installer.nsi +++ b/packaging/Windows/ATCS_Installer.nsi @@ -67,22 +67,22 @@ Section install FileWrite $9 '$\r$\n' FileWrite $9 'set "ATCS_DIR=%~dp0"$\r$\n' FileWrite $9 'set "MAX_MEM=1024M"$\r$\n' - FileWrite $9 'set "CP=%ATCS_DIR%lib\*"$\r$\n' + FileWrite $9 'REM required minimum java version is 11$\r$\n' FileWrite $9 'set "JAVA=$R0"$\r$\n' - FileWrite $9 'set "JAVA_OPTS="$\r$\n' + FileWrite $9 'set "JAVA_OPTS=-DFONT_SCALE=1.0 -Dswing.aatext=true"$\r$\n' FileWrite $9 'set "ENV_FILE=%ATCS_DIR%ATCS.env.bat"$\r$\n' - FileWrite $9 'set "MAIN_CLASS=com.gpl.rpg.atcontentstudio.ATContentStudio"$\r$\n' FileWrite $9 '$\r$\n' FileWrite $9 'if exist "%ENV_FILE%" ($\r$\n' FileWrite $9 ' call "%ENV_FILE%"$\r$\n' FileWrite $9 ') else ($\r$\n' FileWrite $9 ' echo REM set "MAX_MEM=%MAX_MEM%">"%ENV_FILE%"$\r$\n' + FileWrite $9 ' echo REM required minimum java version is 11$\r$\n' FileWrite $9 ' echo REM set "JAVA=%JAVA%">>"%ENV_FILE%"$\r$\n' FileWrite $9 ' echo REM set "JAVA_OPTS=%JAVA_OPTS%">>"%ENV_FILE%"$\r$\n' FileWrite $9 ' echo.>>"%ENV_FILE%"$\r$\n' FileWrite $9 ')$\r$\n' FileWrite $9 '$\r$\n' - FileWrite $9 'start "" "%JAVA%" %JAVA_OPTS% -Xmx%MAX_MEM% -jar ATCS.jar$\r$\n' + FileWrite $9 'start "" "%JAVA%" %JAVA_OPTS% -Xmx%MAX_MEM% -jar "%ATCS_DIR%\ATCS.jar"$\r$\n' FileClose $9 WriteUninstaller "$INSTDIR\Uninstall.exe" diff --git a/packaging/common/ATCS.cmd b/packaging/common/ATCS.cmd index d0d6449..912b902 100644 --- a/packaging/common/ATCS.cmd +++ b/packaging/common/ATCS.cmd @@ -2,6 +2,7 @@ set "ATCS_DIR=%~dp0" set "MAX_MEM=1024M" +REM required minimum java version is 11 set "JAVA=java.exe" set "JAVA_OPTS=-DFONT_SCALE=1.0 -Dswing.aatext=true" set "ENV_FILE=%ATCS_DIR%ATCS.env.bat" @@ -10,6 +11,7 @@ if exist "%ENV_FILE%" ( call "%ENV_FILE%" ) else ( echo REM set "MAX_MEM=%MAX_MEM%">"%ENV_FILE%" + echo REM required minimum java version is 11 echo REM set "JAVA=%JAVA%">>"%ENV_FILE%" echo REM set "JAVA_OPTS=%JAVA_OPTS%">>"%ENV_FILE%" echo.>>"%ENV_FILE%" diff --git a/packaging/common/ATCS.sh b/packaging/common/ATCS.sh index 61086ba..8ec6397 100755 --- a/packaging/common/ATCS.sh +++ b/packaging/common/ATCS.sh @@ -1,9 +1,11 @@ -#!/bin/bash +#!/usr/bin/env bash + +# get the directory of this script ATCS_DIR="$(dirname "$(readlink -f "$0" || greadlink -f "$0" || stat -f "$0")")" echo "ATCS_DIR: '${ATCS_DIR}'" MAX_MEM="512M" -JAVA="java" +JAVA="java" # minimum required version is Java 11 JAVA_OPTS='-DFONT_SCALE=1.0 -Dswing.aatext=true' ENV_FILE="${ATCS_DIR}/ATCS.env" @@ -13,7 +15,7 @@ if [ -f "${ENV_FILE}" ]; then else { echo "#MAX_MEM=\"${MAX_MEM}\"" - echo "#JAVA=\"${JAVA}\"" + echo "#JAVA=\"${JAVA}\" # minimum required version is Java 11" echo "#JAVA_OPTS=\"${JAVA_OPTS}\"" echo "" }>"${ENV_FILE}"