Fixed MODS provides from github release URLs

For #731
This commit is contained in:
Geoff Bourne 2021-01-28 20:55:08 -06:00
parent 54027049d3
commit ffec50141a

View File

@ -81,16 +81,23 @@ if [[ "$MODS" ]]; then
do do
if isURL $i; then if isURL $i; then
log "Downloading mod/plugin $i ..." log "Downloading mod/plugin $i ..."
effective_url=$(resolveEffectiveUrl "$i") if isValidFileURL jar "$i"; then
if isValidFileURL jar "${effective_url}"; then if ! curl -fsSL -o "${out_dir}/$(getFilenameFromUrl "${i}")" "${i}"; then
out_file=$(getFilenameFromUrl "${effective_url}")
if ! curl -fsSL -o "${out_dir}/$out_file" "${effective_url}"; then
log "ERROR: failed to download from $i into $out_dir" log "ERROR: failed to download from $i into $out_dir"
exit 2 exit 2
fi fi
else else
log "ERROR: $effective_url resolved from $i is not a valid jar URL" effective_url=$(resolveEffectiveUrl "$i")
exit 2 if isValidFileURL jar "${effective_url}"; then
out_file=$(getFilenameFromUrl "${effective_url}")
if ! curl -fsSL -o "${out_dir}/$out_file" "${effective_url}"; then
log "ERROR: failed to download from $i into $out_dir"
exit 2
fi
else
log "ERROR: $effective_url resolved from $i is not a valid jar URL"
exit 2
fi
fi fi
else else
log "ERROR Invalid URL given in MODS: $i" log "ERROR Invalid URL given in MODS: $i"