From d45ef1bfcfc8f579a88018523c84689b3e3c3a90 Mon Sep 17 00:00:00 2001
From: Geoff Bourne <itzgeoff@gmail.com>
Date: Fri, 30 Dec 2022 10:25:58 -0600
Subject: [PATCH] Restore FORGE_INSTALLER (again) using mc-image-helper

---
 scripts/start-deployForge | 31 +++++++++++++++++++++++--------
 1 file changed, 23 insertions(+), 8 deletions(-)

diff --git a/scripts/start-deployForge b/scripts/start-deployForge
index ea3aff59365..52e5d956ea3 100755
--- a/scripts/start-deployForge
+++ b/scripts/start-deployForge
@@ -7,16 +7,31 @@
 . "${SCRIPTS:-$(dirname "$0")}/start-utils"
 isDebugging && set -x
 
-if ! mc-image-helper install-forge \
-  --output-directory=/data \
-  --results-file=/data/.run-forge.env \
-  --minecraft-version="${VANILLA_VERSION}" \
-  --forge-version="${FORGE_VERSION}" \
-  --force-reinstall="${FORGE_FORCE_REINSTALL}"; then
-    log "ERROR failed to install forge"
-    exit 1
+if [[ ${FORGE_INSTALLER} ]]; then
+  if ! mc-image-helper install-forge \
+    --output-directory=/data \
+    --results-file=/data/.run-forge.env \
+    --minecraft-version="${VANILLA_VERSION}" \
+    --forge-installer="${FORGE_INSTALLER}" \
+    --force-reinstall="${FORGE_FORCE_REINSTALL}"; then
+      log "ERROR failed to install Forge given installer ${FORGE_INSTALLER}"
+      exit 1
+  fi
+
+else
+  if ! mc-image-helper install-forge \
+    --output-directory=/data \
+    --results-file=/data/.run-forge.env \
+    --minecraft-version="${VANILLA_VERSION}" \
+    --forge-version="${FORGE_VERSION}" \
+    --force-reinstall="${FORGE_FORCE_REINSTALL}"; then
+      log "ERROR failed to install Forge"
+      exit 1
+  fi
+
 fi
 
+
 # grab SERVER and export it
 set -a
 source /data/.run-forge.env