From 8f5cc315d9855979d1e3226449e5698aedd260fe Mon Sep 17 00:00:00 2001
From: Geoff Bourne <itzgeoff@gmail.com>
Date: Wed, 12 Oct 2022 19:23:01 -0500
Subject: [PATCH] Setup MEMORY variables earlier to allow use in Spigot build
 (#1779)

---
 scripts/start-configuration | 5 +++++
 scripts/start-finalExec     | 4 ----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/scripts/start-configuration b/scripts/start-configuration
index ea6a5137..9f9ab7b9 100755
--- a/scripts/start-configuration
+++ b/scripts/start-configuration
@@ -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
diff --git a/scripts/start-finalExec b/scripts/start-finalExec
index 2917cd86..bdecae36 100755
--- a/scripts/start-finalExec
+++ b/scripts/start-finalExec
@@ -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