From b38c00881b65f4e967269f3c613f1909d4502eab Mon Sep 17 00:00:00 2001
From: Jeremy White <dudymas@gmail.com>
Date: Fri, 8 Feb 2019 11:31:40 -0500
Subject: [PATCH] fix(minecraft/entrypoint): several small defects with
 manifest loop

---
 minecraft-server/start-finalSetup02Modpack | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/minecraft-server/start-finalSetup02Modpack b/minecraft-server/start-finalSetup02Modpack
index b7712485..29462159 100755
--- a/minecraft-server/start-finalSetup02Modpack
+++ b/minecraft-server/start-finalSetup02Modpack
@@ -75,12 +75,17 @@ if [[ "$MANIFEST" ]]; then
 case "X$MANIFEST" in
   X*.json)
     if [ -f "${MANIFEST}" ]; then
-      jq --slurpfile m "${MANIFEST}" '$m.files | (.projectID|tostring) + " " + (.fileID|tostring)'| while read -r p f
+      MOD_DIR=${FTB_BASE_DIR:-/data/mods}
+      echo "Starting manifest download..."
+      cat "${MANIFEST}" | jq -r '$.files[] | (.projectID|tostring) + " " + (.fileID|tostring)'| while read -r p f
       do
-        url="${CURSE_URL_BASE}/${p}/files/${f}/download"
-        echo Downloading curseforge mod $url
-        #  Manifest usually doesn't have mod names. Using id should be fine, tho
-        curl -sSL -o /data/mods/${p}_${f}.jar
+        if [ ! -f $MOD_DIR/${p}_${f}.jar ]
+        then
+          url="${CURSE_URL_BASE}/${p}/files/${f}/download"
+          echo Downloading curseforge mod $url
+          #  Manifest usually doesn't have mod names. Using id should be fine, tho
+          curl -sSL "${url}" -o $MOD_DIR/${p}_${f}.jar
+        fi
       done
     else
       echo "Could not find manifest file, unsufficient privs, or malformed path."