Improved handling of missing Paper server version downloads

Fixes #607
This commit is contained in:
Geoff Bourne 2020-08-15 10:02:45 -05:00
parent 99ed83022e
commit 8a5e5bf01e

View File

@ -1,6 +1,7 @@
#!/bin/bash #!/bin/bash
. ${SCRIPTS:-/}start-utils . ${SCRIPTS:-/}start-utils
set -o pipefail
: ${PAPERBUILD:=latest} : ${PAPERBUILD:=latest}
export SERVER=paper_server-${VANILLA_VERSION}-${PAPERBUILD}.jar export SERVER=paper_server-${VANILLA_VERSION}-${PAPERBUILD}.jar
@ -11,8 +12,14 @@ fi
downloadUrl=${PAPER_DOWNLOAD_URL:-https://papermc.io/api/v1/paper/${VANILLA_VERSION}/${PAPERBUILD}/download} downloadUrl=${PAPER_DOWNLOAD_URL:-https://papermc.io/api/v1/paper/${VANILLA_VERSION}/${PAPERBUILD}/download}
log "Downloading Paper $VANILLA_VERSION (build $PAPERBUILD) from $downloadUrl ..." log "Downloading Paper $VANILLA_VERSION (build $PAPERBUILD) from $downloadUrl ..."
if ! curl -fsSL -o "$SERVER" $zarg "$downloadUrl"; then if ! curl -fsSL -o "$SERVER" $zarg "$downloadUrl" 2> /dev/null; then
log "ERROR: failed to download from $downloadUrl (status=$?)" if versions=$(curl -fsSL https://papermc.io/api/v1/paper 2> /dev/null | jq -r '.versions | join(", ")'); then
log "ERROR: ${VANILLA_VERSION} is not (yet) published by PaperMC"
log " The following versions are available: "
log " ${versions}"
else
log "ERROR: failed to contact PaperMC at https://papermc.io/api/v1/paper"
fi
exit 3 exit 3
fi fi