update

testing/Dockerfile

@@ -34,16 +34,16 @@ RUN apt-get -y update \
 	&& update-ca-certificates -f;
 
 # Folder creation.
-RUN mkdir -p /MCserver /MCtemp \
+RUN mkdir -p /mc_server /mc_temp \
-	&& chmod 777 -R /MCserver /MCtemp \
+	&& chmod 777 -R /mc_server /mc_temp \
-	&& chown 99:100 -R /MCserver /MCtemp
+	&& chown 99:100 -R /mc_server /mc_temp
 
 # Main script
-RUN wget "$INSTALL_SCRIPT" -O /MCtemp/install_script.sh \
+RUN wget "$INSTALL_SCRIPT" -O /mc_temp/install_script.sh \
-	&& chmod +x /MCtemp/install_script.sh
+	&& chmod +x /mc_temp/install_script.sh
 
 # Directory where data is stored
-VOLUME /MCserver
+VOLUME /mc_server
 
 # Run command
-CMD [ "/bin/bash", "./MCtemp/install_script.sh" ]
+CMD [ "/bin/bash", "./mc_temp/install_script.sh" ]

testing/install_script.sh

@@ -2,17 +2,24 @@
 # Copyright (c) 2022 fithwum
 # All rights reserved
 
-MC_DIR=/MCserver
+MC_DIR_OLD=/MCserver
+MC_DIR=/mc_server
+
+if [ -d "$MC_DIR_OLD" ]; then
+    mkdir -p "$MC_DIR"
+    mv $MC_DIR_OLD/* "$MC_DIR/" 2>/dev/null || true
+fi
+
 EULA_FILE=$MC_DIR/eula.txt
 EULA_MARKER=$MC_DIR/.eula_accepted
 
 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')
 BUKKIT_INSTALLER_FILE=https://cdn.getbukkit.org/craftbukkit/craftbukkit-$MC_VERSION.jar
-FORGE_INSTALLER_FILE=https://maven.minecraftforge.net/net/minecraftforge/forge/$MC_VERSION-$FORGE_VERSION/forge-$MC_VERSION-$FORGE_VERSION-installer.jar
-NEOFORGED_INSTALLER_FILE=https://maven.neoforged.net/releases/net/neoforged/neoforge/$NEOFORGED_VERSION/neoforge-$NEOFORGED_VERSION-installer.jar
 FABRIC_SERVER_FILE=https://meta.fabricmc.net/v2/versions/loader/$MC_VERSION/$FABRIC_VERSION/$FABRIC_INSTALLER_VERSION/server/jar
 QUILT_INSTALLER_FILE=https://quiltmc.org/api/v1/download-latest-installer/java-universal
+FORGE_INSTALLER_FILE=https://maven.minecraftforge.net/net/minecraftforge/forge/$MC_VERSION-$FORGE_VERSION/forge-$MC_VERSION-$FORGE_VERSION-installer.jar
+NEOFORGED_INSTALLER_FILE=https://maven.neoforged.net/releases/net/neoforged/neoforge/$NEOFORGED_VERSION/neoforge-$NEOFORGED_VERSION-installer.jar
 
 # Install java
 if dpkg -s openjdk-$JAVA_VERSION-jre-headless &> /dev/null
@@ -43,13 +50,13 @@ fi
 # WORKING
 if [ $MC_TYPE = "vanilla" ]; then
     echo "INFO ! Vanilla Selected"
-	if [ -e $MC_DIR/MCserver-$MC_VERSION.jar ]
+	if [ -e $MC_DIR/mcserver-$MC_VERSION.jar ]
 		then
 			echo " "
-			echo "INFO ! MCserver-$MC_VERSION.jar found starting now."
+			echo "INFO ! mcserver-$MC_VERSION.jar found starting now."
 		else
 			echo " "
-			echo "WARNING ! MCserver-$MC_VERSION.jar is out of date/missing ... will download now."
+			echo "WARNING ! mcserver-$MC_VERSION.jar is out of date/missing ... will download now."
 			echo " "
 			echo "INFO ! Cleaning old files."
 			cd $MC_DIR
@@ -57,8 +64,8 @@ if [ $MC_TYPE = "vanilla" ]; then
 			rm -fr *.jar
 			rm -fr libraries
 			mv -v *.log old-server-versions/
-			wget --no-cache --show-progress --progress=bar:force:noscroll $MC_SERVER_FILE -O MCserver-$MC_VERSION.jar
+			wget --no-cache --show-progress --progress=bar:force:noscroll $MC_SERVER_FILE -O mcserver-$MC_VERSION.jar
-			chmod +x MCserver-$MC_VERSION.jar
+			chmod +x mcserver-$MC_VERSION.jar
 			echo " "
 			echo "WARNING ! run-$MC_TYPE-$MC_VERSION.sh is out of date/missing ... will generate now."
 			mv -v run-*.sh old-server-versions/
@@ -67,8 +74,8 @@ if [ $MC_TYPE = "vanilla" ]; then
 			# Copyright (c) 2022 fithwum
 			# All rights reserved
 
-			cd /MCserver
+			cd /mc_server
-			JAR=./MCserver-*.jar
+			JAR=./mcserver-*.jar
 
 			while [ true ]; do
 				java -Xmx$XMX_SIZE -Xms$XMS_SIZE -Xmn$XMN_SIZE -Dbungee.epoll=false -jar $JAR nogui
@@ -106,7 +113,7 @@ elif [ $MC_TYPE = "bukkit" ]; then
 			# Copyright (c) 2022 fithwum
 			# All rights reserved
 
-			cd /MCserver
+			cd /mc_server
 			JAR=./craftbukkit-*.jar
 			
 			while [ true ]; do
@@ -145,7 +152,7 @@ elif [ $MC_TYPE = "fabric" ]; then
 			# Copyright (c) 2022 fithwum
 			# All rights reserved
 
-			cd /MCserver
+			cd /mc_server
 			JAR=./fabric-*-*.jar
 			
 			while [ true ]; do
@@ -189,7 +196,7 @@ elif [ $MC_TYPE = "quilt" ]; then
 			# Copyright (c) 2022 fithwum
 			# All rights reserved
 			
-			cd /MCserver
+			cd /mc_server
 			JAR=./quilt-server-launch.jar
 			
 			while [ true ]; do
@@ -226,11 +233,6 @@ elif [ $MC_TYPE = "forge" ]; then
 			java -jar forge-$MC_VERSION-$FORGE_VERSION-installer.jar --installServer
 			mv -v run.sh run-$MC_TYPE-$MC_VERSION.sh
 			chmod +x run-$MC_TYPE-$MC_VERSION.sh
-			# cat > user_jvm_args.txt <<- "EOF"
-			# -Xmx${XMX_SIZE}
-			# -Xms${XMS_SIZE}
-			# -Xmn${XMN_SIZE}
-			# EOF
 			tee user_jvm_args.txt <<-EOF
 			-Xmx${XMX_SIZE}
 			-Xms${XMS_SIZE}
@@ -260,11 +262,6 @@ elif [ $MC_TYPE = "neoforged" ]; then
 			java -jar neoforge-$NEOFORGED_VERSION-installer.jar --installServer
 			mv -v run.sh run-$MC_TYPE-$MC_VERSION.sh
 			chmod +x run-$MC_TYPE-$MC_VERSION.sh
-			# cat > user_jvm_args.txt <<- "EOF"
-			# -Xmx${XMX_SIZE}
-			# -Xms${XMS_SIZE}
-			# -Xmn${XMN_SIZE}
-			# EOF
 			tee user_jvm_args.txt <<-EOF
 			-Xmx${XMX_SIZE}
 			-Xms${XMS_SIZE}