Mirror/docker-minecraft-server
1
0
Fork 0
mirror of https://github.com/itzg/docker-minecraft-server.git synced 2024-06-07 19:40:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improved handling of bad spigot/bukkit downloads via temp file

Browse Source 
For #655
This commit is contained in:
Geoff Bourne 2020-11-02 20:31:01 -06:00
parent 31b8535854
commit e56a74dc81
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
start-deployBukkitSpigot
View File

@ -72,8 +72,9 @@ function downloadSpigot {
zarg="-z $SERVER" zarg="-z $SERVER"
fi fi
log "Downloading $match from $downloadUrl ..." log "Downloading $match from $downloadUrl ..."
curl -fsSL -o $SERVER $zarg "$downloadUrl" tmpJar=/tmp/${getbukkitFlavor}.jar
if [[ $? != 0 || $(grep -c "DOCTYPE html" $SERVER) != 0 ]]; then curl -fsSL -o "$tmpJar" $zarg "$downloadUrl"
if [[ $? != 0 || $(grep -c "DOCTYPE html" $tmpJar) != 0 ]]; then
cat <<EOF cat <<EOF
ERROR: failed to download from $downloadUrl ERROR: failed to download from $downloadUrl
@ -83,6 +84,7 @@ ERROR: failed to download from $downloadUrl
EOF EOF
exit 3 exit 3
fi fi
mv "$tmpJar" "$SERVER"
JVM_OPTS="${JVM_OPTS} -DIReallyKnowWhatIAmDoingISwear" JVM_OPTS="${JVM_OPTS} -DIReallyKnowWhatIAmDoingISwear"
export JVM_OPTS export JVM_OPTS