diff --git a/testing/install_script.sh b/testing/install_script.sh index 9b2ec59..9c44aa7 100644 --- a/testing/install_script.sh +++ b/testing/install_script.sh @@ -107,7 +107,7 @@ sleep 1 # Run Minecraft server. echo " " echo "INFO ! Starting Minecraft Server $MC_VERSION" -#exec /MCserver/run-$MC_VERSION.sh --dataPath=/MCserver -screen -dmS MCserver /MCserver/run-$MC_VERSION.sh --dataPath=/MCserver +exec /MCserver/run-$MC_VERSION.sh --dataPath=/MCserver +#screen -dmS MCserver /MCserver/run-$MC_VERSION.sh --dataPath=/MCserver exit \ No newline at end of file diff --git a/testing/run.sh b/testing/run.sh index f294f43..aa17477 100644 --- a/testing/run.sh +++ b/testing/run.sh @@ -5,9 +5,23 @@ cd /MCserver JAR=./MCserver-*.jar -while [ true ]; do - java -Xmx$XMX_SIZE -Xms$XMS_SIZE -Xmn$XMN_SIZE -jar $JAR nogui - if [ $? -eq 0 ]; then - break - fi -done \ No newline at end of file +# Check if a screen session is already running +if screen -list | grep -q "MCserver"; then + echo "INFO ! A screen session for the Minecraft server is already running." +else + # Start the Minecraft server in a detached screen session + echo "INFO ! Starting Minecraft Server in a screen session." + screen -dmS MCserver bash -c 'while true; do + java -Xmx$XMX_SIZE -Xms$XMS_SIZE -Xmn$XMN_SIZE -jar $JAR nogui + if [ $? -eq 0 ]; then + break + fi + done' +fi + +# while [ true ]; do +# java -Xmx$XMX_SIZE -Xms$XMS_SIZE -Xmn$XMN_SIZE -jar $JAR nogui +# if [ $? -eq 0 ]; then +# break +# fi +# done \ No newline at end of file