Mirrors/docker-minecraft-server
2
0
Fork 0
mirror of https://github.com/itzg/docker-minecraft-server synced 2025-01-21 00:13:57 +00:00
Code Issues Projects Releases Packages Wiki Activity

Consistently use curl instead of wget

Browse source
This commit is contained in:
Geoff Bourne 2018-06-25 19:13:47 -05:00
parent 4ff14fbf61
commit 4192bea3ab
5 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
minecraft-server/start-deployBukkitSpigot
View file

@ -4,7 +4,7 @@ function buildSpigotFromSource {
echo "Building Spigot $VANILLA_VERSION from source, might take a while, get some coffee" echo "Building Spigot $VANILLA_VERSION from source, might take a while, get some coffee"
mkdir /data/temp mkdir /data/temp
cd /data/temp cd /data/temp
wget -q -P /data/temp https://hub.spigotmc.org/jenkins/job/BuildTools/lastSuccessfulBuild/artifact/target/BuildTools.jar && \ curl -sSL -o /data/temp/BuildTools.jar https://hub.spigotmc.org/jenkins/job/BuildTools/lastSuccessfulBuild/artifact/target/BuildTools.jar && \
java -jar /data/temp/BuildTools.jar --rev $VANILLA_VERSION 2>&1 |tee /data/spigot_build.log| while read l; do echo -n .; done; echo "done" java -jar /data/temp/BuildTools.jar --rev $VANILLA_VERSION 2>&1 |tee /data/spigot_build.log| while read l; do echo -n .; done; echo "done"
mv spigot-*.jar /data/spigot_server.jar mv spigot-*.jar /data/spigot_server.jar
mv craftbukkit-*.jar /data/craftbukkit_server.jar mv craftbukkit-*.jar /data/craftbukkit_server.jar

2
minecraft-server/start-deploySpongeVanilla
View file

@ -30,7 +30,7 @@ export SERVER="spongevanilla-$SPONGEVERSION.jar"
if [ ! -e $SERVER ]; then if [ ! -e $SERVER ]; then
echo "Downloading $SERVER ..." echo "Downloading $SERVER ..."
wget -q https://repo.spongepowered.org/maven/org/spongepowered/$TYPE/$SPONGEVERSION/$SERVER curl -sSL -o $SERVER https://repo.spongepowered.org/maven/org/spongepowered/$TYPE/$SPONGEVERSION/$SERVER
fi fi
# Continue to Final Setup # Continue to Final Setup

2
minecraft-server/start-deployVanilla
View file

@ -4,7 +4,7 @@ export SERVER="minecraft_server.$VANILLA_VERSION.jar"
if [ ! -e $SERVER ]; then if [ ! -e $SERVER ]; then
echo "Downloading $SERVER ..." echo "Downloading $SERVER ..."
wget -q -O $SERVER $(curl -s $(curl -s 'https://launchermeta.mojang.com/mc/game/version_manifest.json' | jq --arg VANILLA_VERSION "$VANILLA_VERSION" --raw-output '[.versions[]|select(.id == $VANILLA_VERSION)][0].url') | jq --raw-output '.downloads.server.url') curl -sSL -o $SERVER $(curl -s $(curl -s 'https://launchermeta.mojang.com/mc/game/version_manifest.json' | jq --arg VANILLA_VERSION "$VANILLA_VERSION" --raw-output '[.versions[]|select(.id == $VANILLA_VERSION)][0].url') | jq --raw-output '.downloads.server.url')
fi fi
# Continue to Final Setup # Continue to Final Setup

2
minecraft-server/start-finalSetup01World
View file

@ -6,7 +6,7 @@ case "X$WORLD" in
X[Hh][Tt][Tt][Pp]*) X[Hh][Tt][Tt][Pp]*)
echo "Downloading world via HTTP" echo "Downloading world via HTTP"
echo "$WORLD" echo "$WORLD"
wget -q -O - "$WORLD" > /data/world.zip curl -sSL -o - "$WORLD" > /data/world.zip
echo "Unzipping word" echo "Unzipping word"
unzip -q /data/world.zip unzip -q /data/world.zip
rm -f /data/world.zip rm -f /data/world.zip

2
minecraft-server/start-minecraftFinalSetup
View file

@ -13,7 +13,7 @@ fi
if [ -n "$ICON" -a ! -e server-icon.png ]; then if [ -n "$ICON" -a ! -e server-icon.png ]; then
echo "Using server icon from $ICON..." echo "Using server icon from $ICON..."
# Not sure what it is yet...call it "img" # Not sure what it is yet...call it "img"
wget -q -O /tmp/icon.img $ICON curl -sSL -o /tmp/icon.img $ICON
specs=$(identify /tmp/icon.img | awk '{print $2,$3}') specs=$(identify /tmp/icon.img | awk '{print $2,$3}')
if [ "$specs" = "PNG 64x64" ]; then if [ "$specs" = "PNG 64x64" ]; then
mv /tmp/icon.img /data/server-icon.png mv /tmp/icon.img /data/server-icon.png