mc: check validity of downloaded bukkit/spigot jar

Fixes #242
This commit is contained in:
Geoff Bourne 2018-08-18 18:51:45 -05:00
parent 1c5e4b17bf
commit ba4578f451

View file

@ -17,7 +17,7 @@ function downloadSpigot {
local match local match
case "$TYPE" in case "$TYPE" in
*BUKKIT|*bukkit) *BUKKIT|*bukkit)
match="Craftbukkit" match="CraftBukkit"
downloadUrl=${BUKKIT_DOWNLOAD_URL} downloadUrl=${BUKKIT_DOWNLOAD_URL}
getbukkitFlavor=craftbukkit getbukkitFlavor=craftbukkit
;; ;;
@ -40,12 +40,13 @@ function downloadSpigot {
fi fi
echo "Downloading $match from $downloadUrl ..." echo "Downloading $match from $downloadUrl ..."
if ! curl -fsSL -o $SERVER "$downloadUrl"; then curl -fsSL -o $SERVER "$downloadUrl"
if [[ $? != 0 || $(grep -c "DOCTYPE html" $SERVER) != 0 ]]; then
cat <<EOF cat <<EOF
ERROR: failed to download from $downloadUrl ERROR: failed to download from $downloadUrl
Visit https://getbukkit.org/download/${getbukkitFlavor} to lookup the Visit https://getbukkit.org/download/${getbukkitFlavor} to lookup the
exact version, such as 1.4.6-R0.4-SNAPSHOT exact version, such as 1.4.6-R0.4-SNAPSHOT or 1.8-R0.1-SNAPSHOT-LATEST
EOF EOF
exit 3 exit 3