From 59ca1ce3a69e7a4a95103b5ad43a37ad3169a68c Mon Sep 17 00:00:00 2001
From: Geoff Bourne <itzgeoff@gmail.com>
Date: Fri, 11 Dec 2020 21:12:44 -0600
Subject: [PATCH] Improved URL handling for GENERIC_PACK For #684

---
 start-finalSetupModpack | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/start-finalSetupModpack b/start-finalSetupModpack
index e21340cc..0c18406b 100644
--- a/start-finalSetupModpack
+++ b/start-finalSetupModpack
@@ -1,8 +1,11 @@
 #!/bin/bash
 
-set -e
+set -e -o pipefail
 
 . ${SCRIPTS:-/}start-utils
+if isDebugging; then
+  set -x
+fi
 
 #  CURSE_URL_BASE used in manifest downloads below
 CURSE_URL_BASE=${CURSE_URL_BASE:-https://minecraft.curseforge.com/projects}
@@ -140,10 +143,9 @@ fi
 
 if [[ "${GENERIC_PACK}" ]]; then
   if isURL "${GENERIC_PACK}"; then
-    generic_pack_url=${GENERIC_PACK}
-    GENERIC_PACK=/tmp/$(basename ${generic_pack_url})
-    log "Downloading generic pack from ${generic_pack_url} ..."
-    curl -fsSL -o ${GENERIC_PACK} ${generic_pack_url}
+    log "Downloading generic pack ..."
+    curl -fsSL -o /tmp/generic_pack.zip "${GENERIC_PACK}"
+    GENERIC_PACK=/tmp/generic_pack.zip
   fi
 
   sum_file=/data/.generic_pack.sum