From e659343821540f0f57802cd6c53fd847dd4657e8 Mon Sep 17 00:00:00 2001
From: Geoff Bourne <itzgeoff@gmail.com>
Date: Thu, 11 Mar 2021 19:40:11 -0600
Subject: [PATCH] Improved locating of forge server jar created by installer
 #799

---
 start-deployForge | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/start-deployForge b/start-deployForge
index c7f14e6d..089782f6 100644
--- a/start-deployForge
+++ b/start-deployForge
@@ -46,6 +46,8 @@ elif [[ -z $FORGE_INSTALLER ]]; then
 elif [[ ! -e $FORGE_INSTALLER ]]; then
   log "ERROR: the given Forge installer doesn't exist : $FORGE_INSTALLER"
   exit 2
+else
+  shortForgeVersion=$VANILLA_VERSION-custom
 fi
 
 installMarker="/data/.forge-installed-$shortForgeVersion"
@@ -98,7 +100,11 @@ if [ ! -e $installMarker ]; then
   log "Finding installed server jar..."
   unset -v latest
   for file in *forge*.jar; do
-    [[ $file =~ installer ]] || [[ $file -nt $latest ]] && latest=$file
+    if ! [[ $file =~ installer ]]; then
+      if [[ -z $latest ]] || [[ $file -nt $latest ]]; then
+        latest=$file
+      fi
+    fi
   done
   if [[ -z $latest ]]; then
     log "Unable to derive server jar for Forge"