Changed Paper update process to check FORCE_REDOWNLOAD first

For #634
This commit is contained in:
Geoff Bourne 2020-09-16 17:09:16 -05:00
parent 0ddabf3089
commit 7c3139226c

View File

@ -2,17 +2,20 @@
. ${SCRIPTS:-/}start-utils
set -o pipefail
isDebugging && set -x
: ${PAPERBUILD:=latest}
export SERVER=paper_server-${VANILLA_VERSION}-${PAPERBUILD}.jar
if [ -f "$SERVER" ] && ! isTrue "$FORCE_REDOWNLOAD"; then
zarg="-z '$SERVER'"
if [ ! -f "$SERVER" ] || isTrue "$FORCE_REDOWNLOAD"; then
if [ -f "$SERVER" ]; then
zarg=(-z "$SERVER")
fi
downloadUrl=${PAPER_DOWNLOAD_URL:-https://papermc.io/api/v1/paper/${VANILLA_VERSION}/${PAPERBUILD}/download}
log "Downloading Paper $VANILLA_VERSION (build $PAPERBUILD) from $downloadUrl ..."
out=$(curl -fsSL -o "$SERVER" $zarg "$downloadUrl" 2>&1)
out=$(curl -fsSL -o "$SERVER" "${zarg[@]}" "$downloadUrl" 2>&1)
case $? in
0)
;;
@ -38,6 +41,7 @@ case $? in
exit 3
;;
esac
fi
# Normalize on Spigot for downstream operations
export TYPE=SPIGOT