diff --git a/testing/install_script.sh b/testing/install_script.sh index a7fc57b..6121502 100644 --- a/testing/install_script.sh +++ b/testing/install_script.sh @@ -7,7 +7,7 @@ export DISPLAY=0 VERSION_CHECK=$(curl -s "https://piston-meta.mojang.com/mc/game/version_manifest_v2.json" | grep -Pom 1 '"url": "\K[^"]*'$MC_VERSION'.json') MC_SERVER_FILE=$(curl -s $VERSION_CHECK | jq --raw-output '.downloads.server.url') -MC_RUN_FILE=https://gitlab.fithwum.tech/fithwum/minecraft/-/raw/master/vanilla/run.sh +MC_RUN_FILE=https://gitlab.fithwum.tech/fithwum/minecraft/-/raw/master/testing/run.sh rm -fr /MCserver/MCserver_*.jar rm -fr /MCserver/run_*.sh @@ -54,7 +54,7 @@ else fi echo " " echo "WARNING ! EULA not accepted, you must accept the EULA" - echo " to start the Server, putting server in sleep mode" + echo " to start the Server, putting server in sleep mode." sleep infinity fi fi @@ -78,15 +78,30 @@ if [ "$ACCEPT_EULA" == "true" ]; then elif [ "$ACCEPT_EULA" == "false" ]; then echo " " echo "WARNING ! EULA not accepted, you must accept the EULA" - echo " to start the Server, putting server in sleep mode" + echo " to start the Server, putting server in sleep mode." sleep infinity else echo " " - echo "WARNING ! Something went wrong, please check EULA variable" + echo "WARNING ! Something went wrong, please check EULA variable." fi sleep 1 -sed -i 's/server-port=25565/server-port='${GAME_PORT_TCP}'/g' /MCserver/server.properties + + + +if [ "$GAME_PORT_TCP" == "25565" ]; then + if grep -rq 'server-port=25565' /MCserver/server.properties; then + fi + elif [ grep -xq "$GAME_PORT_TCP" server.properties ]; then + echo "INFO ! Game port already set no need to change." + else + echo " " + echo "INFO ! Setting game port." + sed -i 's/server-port=25565/server-port='$GAME_PORT_TCP'/g' /MCserver/server.properties +fi + + + sleep 60 # Set permissions. @@ -99,7 +114,7 @@ sleep 1 # Run Minecraft server. echo " " -echo "INFO ! Starting Minecraft Server $MC_VERSION" +echo "INFO ! Starting Minecraft Server $MC_VERSION." exec /MCserver/run-$MC_VERSION.sh --dataPath=/MCserver exit \ No newline at end of file