Successful spigot/bukkit update check caused grep to fail (#2726)

This commit is contained in:
Geoff Bourne 2024-03-17 22:07:34 -05:00 committed by GitHub
parent 35daf1441a
commit 938b562d21
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 4 additions and 8 deletions

View file

@ -1,11 +1,5 @@
# Bukkit/Spigot
!!! warning
The download provider for Bukkit/Spigot, GetBukkit, is no longer operational. It is recommended that users switch to [Paper](paper.md) instead.
This image still provides an option to build Bukkit/Spigot from source if Paper is not feasible.
Run a Bukkit/Spigot server type by setting the environment variable `TYPE` to "BUKKIT" or "SPIGOT".
!!! example

View file

@ -89,7 +89,7 @@ function downloadSpigot {
tempFile="$SERVER.$$"
# HTTP error or download site responded with an HTML error page
if ! curl -fsSL -o "$tempFile" "${curlArgs[@]}" "$downloadUrl" || grep -iq "doctype html" "$tempFile"; then
if ! curl -fsSL -o "$tempFile" "${curlArgs[@]}" "$downloadUrl" || ( [ -f "$tempFile" ] && grep -iq "doctype html" "$tempFile" ); then
cat <<EOF
@ -113,7 +113,9 @@ EOF
fi
else
mv "$tempFile" "$SERVER"
if [ -f "$tempFile" ]; then
mv "$tempFile" "$SERVER"
fi
fi