From 144e5c2a93f1026f6fcd30410ad55b24d706775f Mon Sep 17 00:00:00 2001 From: Geoff Bourne Date: Sun, 27 Nov 2022 09:19:28 -0600 Subject: [PATCH] Revert "Use HTTP accept when downloading CF modpack (#1837)" (#1850) This reverts commit d36bece8517309f51f5a10b82f73e1b0f8891e8e. --- scripts/start-deployCF | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/scripts/start-deployCF b/scripts/start-deployCF index 2580e979..f02bb9be 100755 --- a/scripts/start-deployCF +++ b/scripts/start-deployCF @@ -42,7 +42,7 @@ downloadModpack() { srv_modpack=${FTB_SERVER_MOD} if isURL "${srv_modpack}"; then log "Downloading modpack from ${srv_modpack}..." - if ! srv_modpack=$(get -o /data --output-filename --skip-existing --accept=application/zip "${srv_modpack}"); then + if ! srv_modpack=$(get -o /data --output-filename --skip-existing "${srv_modpack}"); then log "ERROR: failed to download modpack" exit 1 fi @@ -59,6 +59,11 @@ downloadModpack() { log "FTB server modpack ${srv_modpack} not found." exit 2 fi + if [[ ! "${srv_modpack: -4}" == ".zip" ]]; then + log "FTB server modpack ${srv_modpack} is not a zip archive." + log "Please set FTB_SERVER_MOD to a file with a .zip extension." + exit 2 + fi FTB_SERVER_MOD=${srv_modpack} }