From 45577111814eaeffbfedb067ae6df71bb3246c13 Mon Sep 17 00:00:00 2001
From: robinbraemer <robin.braemer@web.de>
Date: Wed, 13 Mar 2024 12:24:48 +0100
Subject: [PATCH 1/3] Pass EXTRA_ARGS to run.sh (fixes #2714)

---
 scripts/start-finalExec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/start-finalExec b/scripts/start-finalExec
index a007def8920..8a7c0d46946 100755
--- a/scripts/start-finalExec
+++ b/scripts/start-finalExec
@@ -294,7 +294,7 @@ elif [[ $SERVER =~ run.sh ]]; then
     echo "SETUP_ONLY: bash ${SERVER}"
     exit
   fi
-  exec mc-server-runner "${mcServerRunnerArgs[@]}" --shell bash "${SERVER}"
+  exec mc-server-runner "${mcServerRunnerArgs[@]}" --shell bash "${SERVER} ${EXTRA_ARGS}"
 else
   # If we have a bootstrap.txt file... feed that in to the server stdin
   if [ -f /data/bootstrap.txt ]; then

From 9645390b52c49f605b8ff1fc7b839561a9f86c37 Mon Sep 17 00:00:00 2001
From: robinbraemer <robin.braemer@web.de>
Date: Wed, 13 Mar 2024 12:39:57 +0100
Subject: [PATCH 2/3] Add print DEBUG_EXEC in run.sh case too

---
 scripts/start-finalExec | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/scripts/start-finalExec b/scripts/start-finalExec
index 8a7c0d46946..02ac0ec08d6 100755
--- a/scripts/start-finalExec
+++ b/scripts/start-finalExec
@@ -294,6 +294,9 @@ elif [[ $SERVER =~ run.sh ]]; then
     echo "SETUP_ONLY: bash ${SERVER}"
     exit
   fi
+  if isTrue "${DEBUG_EXEC}"; then
+    set -x
+  fi
   exec mc-server-runner "${mcServerRunnerArgs[@]}" --shell bash "${SERVER} ${EXTRA_ARGS}"
 else
   # If we have a bootstrap.txt file... feed that in to the server stdin

From f8c420d6a842f5bf8ec34eed16740494291b1e53 Mon Sep 17 00:00:00 2001
From: robinbraemer <robin.braemer@web.de>
Date: Wed, 13 Mar 2024 13:10:08 +0100
Subject: [PATCH 3/3] fix(try): Pass EXTRA_ARGS as arguments correctly

---
 scripts/start-finalExec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/start-finalExec b/scripts/start-finalExec
index 02ac0ec08d6..1e96b12b31e 100755
--- a/scripts/start-finalExec
+++ b/scripts/start-finalExec
@@ -297,7 +297,7 @@ elif [[ $SERVER =~ run.sh ]]; then
   if isTrue "${DEBUG_EXEC}"; then
     set -x
   fi
-  exec mc-server-runner "${mcServerRunnerArgs[@]}" --shell bash "${SERVER} ${EXTRA_ARGS}"
+  exec mc-server-runner "${mcServerRunnerArgs[@]}" --shell bash "${SERVER}" "${EXTRA_ARGS}"
 else
   # If we have a bootstrap.txt file... feed that in to the server stdin
   if [ -f /data/bootstrap.txt ]; then