From c53137ef563b9d1274f58f2c46e78e52d2b4bc25 Mon Sep 17 00:00:00 2001
From: Geoff Bourne <itzgeoff@gmail.com>
Date: Fri, 2 Sep 2022 23:07:22 -0500
Subject: [PATCH] Fixed issue with GENERIC_PACK where it exits after saving
 checksum

---
 scripts/start-setupModpack | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/scripts/start-setupModpack b/scripts/start-setupModpack
index 5662c536f04..7366aceb62d 100755
--- a/scripts/start-setupModpack
+++ b/scripts/start-setupModpack
@@ -155,7 +155,7 @@ if [[ "$MANIFEST" ]]; then
         EFFECTIVE_MANIFEST_FILE=$MANIFEST
     elif isURL "$MANIFEST"; then
         EFFECTIVE_MANIFEST_FILE=/tmp/manifest.json
-        EFFECTIVE_MANIFEST_URL=$(curl -Ls -o /dev/null -w %{effective_url} $MANIFEST)
+        EFFECTIVE_MANIFEST_URL=$(curl -Ls -o /dev/null -w "%{effective_url}" "$MANIFEST")
         curl -Ls -o $EFFECTIVE_MANIFEST_FILE "$EFFECTIVE_MANIFEST_URL"
     else
         log "MANIFEST='$MANIFEST' is not a valid manifest url or location"
@@ -172,11 +172,11 @@ case "X$EFFECTIVE_MANIFEST_FILE" in
         mkdir -p "$MOD_DIR"
       fi
       log "Starting manifest download..."
-      cat "${EFFECTIVE_MANIFEST_FILE}" | jq -r '.files[] | (.projectID|tostring) + " " + (.fileID|tostring)'| while read -r p f
+      jq -r '.files[] | (.projectID|tostring) + " " + (.fileID|tostring)' "${EFFECTIVE_MANIFEST_FILE}" | while read -r p f
       do
         if [ ! -f $MOD_DIR/${p}_${f}.jar ]
         then
-          redirect_url="$(curl -Ls -o /dev/null -w %{effective_url} ${CURSE_URL_BASE}/${p})"
+          redirect_url="$(curl -Ls -o /dev/null -w "%{effective_url}" "${CURSE_URL_BASE}/${p}")"
           url="$redirect_url/download/${f}/file"
           log Downloading curseforge mod $url
           #  Manifest usually doesn't have mod names. Using id should be fine, tho
@@ -263,7 +263,9 @@ function genericPacks() {
 
       log "Saving generic pack(s) checksum"
       sha1sum "${packFiles[@]}" > "${sum_file}"
-      isDebugging && cat "$sum_file"
+      if isDebugging; then
+        cat "$sum_file"
+      fi
     fi
   fi
 }