diff --git a/testing/install_script.sh b/testing/install_script.sh index 6121502..8ae7d90 100644 --- a/testing/install_script.sh +++ b/testing/install_script.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,31 +78,28 @@ 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 +#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 - -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 +sed -i 's/server-port=25565/server-port='$GAME_PORT_TCP'/g' /MCserver/server.properties +sleep 30 # Set permissions. chown 99:100 -R /MCserver @@ -114,7 +111,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