From 7e2937aa8ddec7311a42f253b30dd4129174b1d8 Mon Sep 17 00:00:00 2001
From: Geoff Bourne <itzgeoff@gmail.com>
Date: Sat, 8 Jan 2022 13:19:30 -0600
Subject: [PATCH] fix(forge): improved tracking and use of Forge run.sh (#1264)

Fixes #1260
---
 scripts/start-finalExec | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/start-finalExec b/scripts/start-finalExec
index f0d6b5fb..d7325a04 100755
--- a/scripts/start-finalExec
+++ b/scripts/start-finalExec
@@ -323,10 +323,10 @@ EOF
   else
     exec mc-server-runner "${mcServerRunnerArgs[@]}" "${finalArgs[@]}"
   fi
-elif [[ -x run.sh ]]; then
+elif [[ $SERVER =~ run.sh ]]; then
   log "Using Forge supplied run.sh script..."
   echo $JVM_XX_OPTS $JVM_OPTS $expandedDOpts > user_jvm_args.txt
-  exec mc-server-runner "${mcServerRunnerArgs[@]}" --shell bash run.sh
+  exec mc-server-runner "${mcServerRunnerArgs[@]}" --shell bash "${SERVER}"
 else
   # If we have a bootstrap.txt file... feed that in to the server stdin
   if [ -f /data/bootstrap.txt ]; then