diff --git a/minecraft-server/start-deployBukkitSpigot b/minecraft-server/start-deployBukkitSpigot index 1ca612ee..de8e2af2 100755 --- a/minecraft-server/start-deployBukkitSpigot +++ b/minecraft-server/start-deployBukkitSpigot @@ -4,7 +4,7 @@ function buildSpigotFromSource { echo "Building Spigot $VANILLA_VERSION from source, might take a while, get some coffee" mkdir /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" mv spigot-*.jar /data/spigot_server.jar mv craftbukkit-*.jar /data/craftbukkit_server.jar diff --git a/minecraft-server/start-deploySpongeVanilla b/minecraft-server/start-deploySpongeVanilla index fd4e781c..f8fa826e 100755 --- a/minecraft-server/start-deploySpongeVanilla +++ b/minecraft-server/start-deploySpongeVanilla @@ -30,7 +30,7 @@ export SERVER="spongevanilla-$SPONGEVERSION.jar" if [ ! -e $SERVER ]; then 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 # Continue to Final Setup diff --git a/minecraft-server/start-deployVanilla b/minecraft-server/start-deployVanilla index 5cddfc1f..64571af2 100755 --- a/minecraft-server/start-deployVanilla +++ b/minecraft-server/start-deployVanilla @@ -4,7 +4,7 @@ export SERVER="minecraft_server.$VANILLA_VERSION.jar" if [ ! -e $SERVER ]; then 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 # Continue to Final Setup diff --git a/minecraft-server/start-finalSetup01World b/minecraft-server/start-finalSetup01World index 0b765bdb..1747400e 100755 --- a/minecraft-server/start-finalSetup01World +++ b/minecraft-server/start-finalSetup01World @@ -6,7 +6,7 @@ case "X$WORLD" in X[Hh][Tt][Tt][Pp]*) echo "Downloading world via HTTP" echo "$WORLD" - wget -q -O - "$WORLD" > /data/world.zip + curl -sSL -o - "$WORLD" > /data/world.zip echo "Unzipping word" unzip -q /data/world.zip rm -f /data/world.zip diff --git a/minecraft-server/start-minecraftFinalSetup b/minecraft-server/start-minecraftFinalSetup index 0277c0c6..567cc93d 100755 --- a/minecraft-server/start-minecraftFinalSetup +++ b/minecraft-server/start-minecraftFinalSetup @@ -13,7 +13,7 @@ fi if [ -n "$ICON" -a ! -e server-icon.png ]; then echo "Using server icon from $ICON..." # 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}') if [ "$specs" = "PNG 64x64" ]; then mv /tmp/icon.img /data/server-icon.png