amorfo77/docker-minecraft-server
1
0
Fork 0
mirror of https://github.com/itzg/docker-minecraft-server.git synced 2026-03-06 14:56:25 +00:00
Code Issues Projects Releases Wiki Activity

Silence content type error for external spiget resources (#1431)

Browse Source
This commit is contained in:
Geoff Bourne
2022-03-15 20:56:25 -05:00
committed by GitHub
parent 7f44a04490
commit fda8981028
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/start-spiget
View File

@@ -88,7 +88,7 @@ downloadResourceFromSpiget() {
resource=${1?}
resourceUrl="https://api.spiget.org/v2/resources/${resource}"
if ! outfile=$(get --output-filename -o /tmp "${acceptArgs[@]}" "${resourceUrl}/download"); then
if ! outfile=$(get_silent --output-filename -o /tmp "${acceptArgs[@]}" "${resourceUrl}/download"); then
log "ERROR: failed to download resource '${resource}' from ${resourceUrl}/download"
if externalUrl=$(get --json-path '$.file.externalUrl' "${resourceUrl}"); then
log " Visit $externalUrl to pre-download the resource"

8
scripts/start-utils
View File

@@ -197,6 +197,14 @@ function get() {
mc-image-helper "${flags[@]}" get "$@"
}
function get_silent() {
local flags=(-s)
if isTrue "${DEBUG_GET:-false}"; then
flags+=("--debug")
fi
mc-image-helper "${flags[@]}" get "$@"
}
function isFamily() {
for f in "${@}"; do
if [[ ${FAMILY^^} == "${f^^}" ]]; then