Handle calculated MEMORY value along with Aikar's flags (#2568)

itzg · Jan 1, 2024 · 6adda8f · 6adda8f
1 parent cbd1e8d
commit 6adda8f
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/scripts/start-finalExec b/scripts/start-finalExec
@@ -88,7 +88,7 @@ elif versionLessThan 1.18.1; then
  fi
 fi
 
-if isTrue ${ENABLE_ROLLING_LOGS:-false}; then
+if isTrue "${ENABLE_ROLLING_LOGS:-false}"; then
  if ! ${canUseRollingLogs}; then
  log "ERROR: Using rolling logs is currently not possible in the selected version due to CVE-2021-44228"
  exit 1
@@ -139,7 +139,7 @@ fi
 if isTrue "${USE_AIKAR_FLAGS}"; then
  # From https://mcflags.emc.gs/
 
- if (( $(normalizeMemSize "${MAX_MEMORY}") >= $(normalizeMemSize 12g) )); then
+ if [[ $MAX_MEMORY ]] && (( $(normalizeMemSize "${MAX_MEMORY}") >= $(normalizeMemSize 12g) )); then
  log "Using Aikar's >12GB flags"
  G1NewSizePercent=40
  G1MaxNewSizePercent=50