From 07c32d8ee4c689c9c4c3bfa2e3f2c81612b05d22 Mon Sep 17 00:00:00 2001 From: Geoff Bourne Date: Tue, 28 Feb 2017 18:32:15 -0600 Subject: [PATCH] [mc] Fixed TYPE=FORGE for alpine base image For #128 --- minecraft-server/start-minecraft.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/minecraft-server/start-minecraft.sh b/minecraft-server/start-minecraft.sh index d8cea4df..8239c989 100755 --- a/minecraft-server/start-minecraft.sh +++ b/minecraft-server/start-minecraft.sh @@ -120,7 +120,7 @@ function installForge { echo "Checking Forge version information." case $FORGEVERSION in RECOMMENDED) - wget -q -O /tmp/forge.json -sSL http://files.minecraftforge.net/maven/net/minecraftforge/forge/promotions_slim.json + wget -q -O /tmp/forge.json http://files.minecraftforge.net/maven/net/minecraftforge/forge/promotions_slim.json FORGE_VERSION=$(cat /tmp/forge.json | jq -r ".promos[\"$norm-recommended\"]") if [ $FORGE_VERSION = null ]; then FORGE_VERSION=$(cat /tmp/forge.json | jq -r ".promos[\"$norm-latest\"]") @@ -138,7 +138,7 @@ function installForge { esac # URL format changed for 1.7.10 from 10.13.2.1300 - sorted=$( (echo $FORGE_VERSION; echo 10.13.2.1300) | sort -V | head -1) + sorted=$( (echo $FORGE_VERSION; echo 10.13.2.1300) | sort | head -1) if [[ $norm == '1.7.10' && $sorted == '10.13.2.1300' ]]; then # if $FORGEVERSION >= 10.13.2.1300 normForgeVersion="$norm-$FORGE_VERSION-$norm"