Setup MEMORY variables earlier to allow use in Spigot build (#1779)

This commit is contained in:
Geoff Bourne authored and GitHub committed 2022-10-12 19:23:01 -05:00
1 parent 61592d5c3e
commit 8f5cc315d9
2 files changed
+5 -4

No files matched your search

+5
View File
@@ -20,6 +20,11 @@ IFS=$'\n\t'
: "${RCON_PORT:=25575}"
export RCON_PASSWORD RCON_PORT
: "${MEMORY=1G}"
: "${INIT_MEMORY=${MEMORY}}"
: "${MAX_MEMORY=${MEMORY}}"
export MEMORY INIT_MEMORY MAX_MEMORY
shopt -s nullglob
isDebugging && set -x
-4
View File
@@ -113,10 +113,6 @@ if [[ ${GUI,,} = false ]]; then
EXTRA_ARGS+=" nogui"
fi
: "${MEMORY=1G}"
: "${INIT_MEMORY=${MEMORY}}"
: "${MAX_MEMORY=${MEMORY}}"
expandedDOpts=
if [ -n "$JVM_DD_OPTS" ]; then
for dopt in $JVM_DD_OPTS