diff --git a/testing/Dockerfile b/testing/Dockerfile index 8c5e1b8..242a8dc 100644 --- a/testing/Dockerfile +++ b/testing/Dockerfile @@ -26,7 +26,7 @@ ARG INSTALL_SCRIPT=https://gitea.fithwum.tech/fithwum/minecraft/raw/branch/maste # Install Java & Dependencies. RUN apt-get -y update \ - && apt-get install -y --no-install-recommends bzip2 lsb-release jq screen \ + && apt-get install -y --no-install-recommends bzip2 lsb-release jq \ && apt-get -y --fix-broken install \ && apt-get -y autoclean \ && apt-get -y autoremove \ diff --git a/testing/install_script.sh b/testing/install_script.sh index 58e74dd..cf3d5c9 100644 --- a/testing/install_script.sh +++ b/testing/install_script.sh @@ -105,14 +105,15 @@ if [ $MC_TYPE = "vanilla" ]; then mv -v run-*.sh old-server-versions/ cat > run-$MC_TYPE-$MC_VERSION.sh <<- "EOF" #!/bin/bash - # Copyright (c) 2022 fithwum + # Copyright (c) 2026 fithwum # All rights reserved + set -e cd /mcserver JAR=./mcserver-*.jar while [ true ]; do - java -Xmx$XMX_SIZE -Xms$XMS_SIZE -Xmn$XMN_SIZE -Dbungee.epoll=false -jar $JAR nogui + exec java -Xmx$XMX_SIZE -Xms$XMS_SIZE -Xmn$XMN_SIZE -Dbungee.epoll=false -jar $JAR nogui if [ $? -eq 0 ]; then break fi @@ -144,14 +145,15 @@ elif [ $MC_TYPE = "bukkit" ]; then mv -v run-*.sh old-server-versions/ cat > run-$MC_TYPE-$MC_VERSION.sh <<- "EOF" #!/bin/bash - # Copyright (c) 2022 fithwum + # Copyright (c) 2026 fithwum # All rights reserved + set -e cd /mcserver JAR=./craftbukkit-*.jar while [ true ]; do - java -Xmx$XMX_SIZE -Xms$XMS_SIZE -Xmn$XMN_SIZE -Dbungee.epoll=false -jar $JAR nogui + exec java -Xmx$XMX_SIZE -Xms$XMS_SIZE -Xmn$XMN_SIZE -Dbungee.epoll=false -jar $JAR nogui if [ $? -eq 0 ]; then break fi @@ -183,14 +185,15 @@ elif [ $MC_TYPE = "fabric" ]; then mv -v run-*.sh old-server-versions/ cat > run-$MC_TYPE-$MC_VERSION.sh <<- "EOF" #!/bin/bash - # Copyright (c) 2022 fithwum + # Copyright (c) 2026 fithwum # All rights reserved + set -e cd /mcserver JAR=./fabric-*-*.jar while [ true ]; do - java -Xmx$XMX_SIZE -Xms$XMS_SIZE -Xmn$XMN_SIZE -Dbungee.epoll=false -jar $JAR nogui + exec java -Xmx$XMX_SIZE -Xms$XMS_SIZE -Xmn$XMN_SIZE -Dbungee.epoll=false -jar $JAR nogui if [ $? -eq 0 ]; then break fi @@ -227,14 +230,15 @@ elif [ $MC_TYPE = "quilt" ]; then mv -v run-*.sh old-server-versions/ cat > run-$MC_TYPE-$MC_VERSION.sh <<- "EOF" #!/bin/bash - # Copyright (c) 2022 fithwum + # Copyright (c) 2026 fithwum # All rights reserved + set -e cd /mcserver JAR=./quilt-server-launch.jar while [ true ]; do - java -Xmx$XMX_SIZE -Xms$XMS_SIZE -Xmn$XMN_SIZE -Dbungee.epoll=false -jar $JAR nogui + exec java -Xmx$XMX_SIZE -Xms$XMS_SIZE -Xmn$XMN_SIZE -Dbungee.epoll=false -jar $JAR nogui if [ $? -eq 0 ]; then break fi @@ -363,7 +367,7 @@ sleep 1 echo " " echo "INFO ! Starting Minecraft Server $MC_TYPE-$MC_VERSION" cd $MC_DIR -exec ./start.sh -# exec ./run-$MC_TYPE-$MC_VERSION.sh +# exec ./start.sh +exec ./run-$MC_TYPE-$MC_VERSION.sh exit \ No newline at end of file