Mirrors/docker-minecraft-server
2
0
Fork 0
mirror of https://github.com/itzg/docker-minecraft-server synced 2024-12-14 06:12:27 +00:00
Code Issues Projects Releases Packages Wiki Activity

Allow non-ZIP urls for download

Browse source 
Add directory rename for Spigot
This commit is contained in:
Steve Shipway 2016-01-02 11:33:05 +13:00
parent a313c03fff
commit 4ab31a049b
1 changed files with 35 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

53
minecraft-server/start-minecraft.sh
View file

@ -33,19 +33,15 @@ esac
cd /data cd /data
echo "Checking minecraft / forge type information." echo "Checking type information."
case "$TYPE" in case "$TYPE" in
VANILLA) *BUKKIT|*bukkit|SPIGOT|spigot)
SERVER="minecraft_server.$VANILLA_VERSION.jar" TYPE=SPIGOT
;;
if [ ! -e $SERVER ]; then FORGE|forge)
echo "Downloading $SERVER ..."
wget -q https://s3.amazonaws.com/Minecraft.Download/versions/$VANILLA_VERSION/$SERVER
fi
;;
FORGE)
# norm := the official Minecraft version as Forge is tracking it. dropped the third part starting with 1.8 # norm := the official Minecraft version as Forge is tracking it. dropped the third part starting with 1.8
TYPE=FORGE
case $VANILLA_VERSION in case $VANILLA_VERSION in
1.7.*) 1.7.*)
norm=$VANILLA_VERSION norm=$VANILLA_VERSION
@ -56,16 +52,16 @@ case "$TYPE" in
;; ;;
esac esac
echo "Checking Forge version information." echo "Checking Forge version information."
case $FORGEVERSION in case $FORGEVERSION in
RECOMMENDED) RECOMMENDED)
FORGE_VERSION=`wget -O - http://files.minecraftforge.net/maven/net/minecraftforge/forge/promotions_slim.json | jsawk -n "out(this.promos['$norm-recommended'])"` FORGE_VERSION=`wget -O - http://files.minecraftforge.net/maven/net/minecraftforge/forge/promotions_slim.json | jsawk -n "out(this.promos['$norm-recommended'])"`
;; ;;
*) *)
FORGE_VERSION=$FORGEVERSION FORGE_VERSION=$FORGEVERSION
;; ;;
esac esac
# URL format changed for 1.7.10 from 10.13.2.1300 # 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 -V | head -1)
@ -87,11 +83,26 @@ case "$TYPE" in
fi fi
;; ;;
VANILLA|vanilla|)
SERVER="minecraft_server.$VANILLA_VERSION.jar"
if [ ! -e $SERVER ]; then
echo "Downloading $SERVER ..."
wget -q https://s3.amazonaws.com/Minecraft.Download/versions/$VANILLA_VERSION/$SERVER
fi
;;
*)
echo "Invalid type: '$TYPE'"
echo "Must be: VANILLA, FORGE, SPIGOT"
exit 1
;;
esac esac
# If supplied with a URL for a world, download it and unpack # If supplied with a URL for a world, download it and unpack
case "X$WORLD" in case "X$WORLD" in
X[Hh][Tt][Tt][Pp]*[Zz][iI][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 wget -q -O - "$WORLD" > /data/world.zip
@ -108,6 +119,12 @@ case "X$WORLD" in
fi fi
done done
fi fi
if [ "$TYPE" = "SPIGOT" ]; then
# Reorganise if a Spigot server
echo "Moving End and Nether maps to Spigot location"
[ -d "/data/world/DIM1" ] && mv -f "/data/world/DIM1" "/data/world_the_end"
[ -d "/data/world/DIM-1" ] && mv -f "/data/world/DIM-1" "/data/world_nether"
fi
;; ;;
*) *)
echo "Invalid URL given for world: Must be HTTP or HTTPS and a ZIP file" echo "Invalid URL given for world: Must be HTTP or HTTPS and a ZIP file"