updates

2023-03-20 09:42:47 -07:00
parent 4e4d2df5a6
commit b152fd3fd3
19 changed files with 213 additions and 32 deletions
--- a/1.15.2/Dockerfile
+++ b/1.15.2/Dockerfile
@@ -0,0 +1,32 @@
+FROM fithwum/debian-base:bullseye
+LABEL maintainer "fithwum"
+
+ENV ACCEPT_EULA="false"
+ENV GAME_PORT=25565
+
+# URL's for files
+ARG INSTALL_SCRIPT=https://raw.githubusercontent.com/fithwum/minecraft/master/1.16/files/Install_Script.sh
+
+# Install java-17 & Dependencies.
+RUN apt-get -y update \
+	&& apt-get -y --fix-broken install \
+	&& apt-get install -y software-properties-common openjdk-17-jdk \
+	&& apt-get clean \
+	&& rm -rf /var/lib/apt/lists/* \
+	&& update-ca-certificates -f;
+
+# Folder creation.
+RUN mkdir -p /MCserver /MCtemp \
+	&& chmod 777 -R /MCserver /MCtemp \
+	&& chown 99:100 -R /MCserver /MCtemp
+ADD "${INSTALL_SCRIPT}" /MCtemp
+RUN chmod +x /MCtemp/Install_Script.sh
+
+# Directory where data is stored
+VOLUME /MCserver
+
+# 25565 Default.
+EXPOSE 25565/udp 25565/tcp
+
+# Run command
+CMD [ "/bin/bash", "./MCtemp/Install_Script.sh" ]
--- a/1.15.2/files/Install_Script.sh
+++ b/1.15.2/files/Install_Script.sh
@@ -0,0 +1,102 @@
+#!/bin/bash
+# Copyright (c) 2022 fithwum
+# All rights reserved
+
+# Variables.
+echo " "
+echo "INFO ! Checking for latest Minecraft Server version."
+MC_VERSION_OLD=1.15.1
+MC_VERSION=1.15.2
+MC_SERVER_FILE=https://launcher.mojang.com/v1/objects/bb2b6b1aefcd70dfd1892149ac3a215f6c636b07/server.jar
+MC_RUN_FILE=https://raw.githubusercontent.com/fithwum/minecraft/master/${MC_VERSION}/files/run.sh
+
+# Main install (Debian).
+# Check for files in /MCserver and download if needed.
+if [ -e /MCserver/MCserver_${MC_VERSION}.jar ]
+	then
+		echo " "
+		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 " "
+			echo "INFO ! Cleaning old files."
+			mkdir /MCserver/old-server-versions/${MC_VERSION_OLD}
+			mv /MCserver/MCserver_${MC_VERSION_OLD}.jar /MCserver/old-server-versions/${MC_VERSION_OLD}
+			mv /MCserver/run_${MC_VERSION_OLD}.sh /MCserver/old-server-versions/${MC_VERSION_OLD}
+			wget --no-cache ${MC_SERVER_FILE} -O /MCserver/MCserver_${MC_VERSION}.jar
+fi
+
+sleep 1
+
+# Looking for run_${MC_VERSION}.sh
+if [ -e /MCserver/run_${MC_VERSION}.sh ]
+	then
+		echo " "
+		echo "INFO ! run_${MC_VERSION}.sh found ... will use existing file."
+	else
+		echo " "
+		echo "WARNING ! run_${MC_VERSION_OLD}.sh is out of date/missing ... will download now."
+		mv /MCserver/run_${MC_VERSION_OLD}.sh /MCserver/old-server-versions/${MC_VERSION_OLD}
+		wget --no-cache ${MC_RUN_FILE} -O /MCserver/run_${MC_VERSION}.sh
+fi
+
+sleep 1
+
+# Check for EULA
+if [ ! -f /MCserver/eula.txt ]; then
+	:
+else
+	if [ "${ACCEPT_EULA}" == "false" ]; then
+		if grep -rq 'eula=true' /MCserver/eula.txt; then
+			sed -i '/eula=true/c\eula=false' /MCserver/eula.txt
+		fi
+			echo " "
+			echo "WARNING ! EULA not accepted, you must accept the EULA"
+			echo "			to start the Server, putting server in sleep mode"
+		sleep infinity
+    fi
+fi
+
+sleep 1
+
+if [ ! -f /MCserver/eula.txt ]; then
+	echo " "
+	echo "WARNING ! EULA not found please stand by..."
+	sleep 5
+fi
+if [ "${ACCEPT_EULA}" == "true" ]; then
+	if grep -rq 'eula=false' /MCserver/eula.txt; then
+		sed -i '/eula=false/c\eula=true' /MCserver/eula.txt
+		echo " "
+		echo "INFO ! EULA accepted, server restarting, please wait..."
+		sleep 1
+		exec /MCserver/run_${MC_VERSION}.sh --dataPath=/MCserver
+		exit 0
+	fi
+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"
+	sleep infinity
+else
+	echo " "
+	echo "WARNING ! Something went wrong, please check EULA variable"
+fi
+
+sleep 1
+
+# Set permissions.
+chown 99:100 -R /MCserver
+chmod 777 -R /MCserver
+chmod +x /MCserver/run_${MC_VERSION}.sh
+chmod +x /MCserver/MCserver_${MC_VERSION}.jar
+
+sleep 1
+
+# Run Minecraft server.
+echo " "
+echo "INFO ! Starting Minecraft Server ${MC_VERSION}"
+exec /MCserver/run_${MC_VERSION}.sh --dataPath=/MCserver
+
+exit
--- a/1.15.2/files/run.sh
+++ b/1.15.2/files/run.sh
@@ -0,0 +1,15 @@
+#!/bin/bash
+# Copyright (c) 2022 fithwum
+# All rights reserved
+
+MC_VERSION=1.15.2
+
+cd /MCserver
+JAR=./MCserver_${MC_VERSION}.jar
+
+while [ true ]; do
+  java -Xmx4G -Xms1024M -Xmn1G -jar $JAR nogui
+  if [ $? -eq 0 ]; then
+    break
+  fi
+done
--- a/1.16.1/files/Install_Script.sh
+++ b/1.16.1/files/Install_Script.sh
@@ -7,6 +7,8 @@ echo " "
 echo "INFO ! Checking for latest Minecraft Server version."
 MC_VERSION_OLD=1.16
 MC_VERSION=1.16.1
+MC_SERVER_FILE=https://launcher.mojang.com/v1/objects/a412fd69db1f81db3f511c1463fd304675244077/server.jar
+MC_RUN_FILE=https://raw.githubusercontent.com/fithwum/minecraft/master/${MC_VERSION}/files/run.sh

 # Main install (Debian).
 # Check for files in /MCserver and download if needed.
@@ -22,7 +24,7 @@ if [ -e /MCserver/MCserver_${MC_VERSION}.jar ]
 			mkdir /MCserver/old-server-versions/${MC_VERSION_OLD}
 			mv /MCserver/MCserver_${MC_VERSION_OLD}.jar /MCserver/old-server-versions/${MC_VERSION_OLD}
 			mv /MCserver/run_${MC_VERSION_OLD}.sh /MCserver/old-server-versions/${MC_VERSION_OLD}
-			wget --no-cache https://launcher.mojang.com/v1/objects/a412fd69db1f81db3f511c1463fd304675244077/server.jar -O /MCserver/MCserver_${MC_VERSION}.jar
+			wget --no-cache ${MC_SERVER_FILE} -O /MCserver/MCserver_${MC_VERSION}.jar
 fi

 sleep 1
@@ -36,7 +38,7 @@ if [ -e /MCserver/run_${MC_VERSION}.sh ]
 		echo " "
 		echo "WARNING ! run_${MC_VERSION_OLD}.sh is out of date/missing ... will download now."
 		mv /MCserver/run_${MC_VERSION_OLD}.sh /MCserver/old-server-versions/${MC_VERSION_OLD}
-		wget --no-cache https://raw.githubusercontent.com/fithwum/minecraft/master/files/run.sh -O /MCserver/run_${MC_VERSION}.sh
+		wget --no-cache ${MC_RUN_FILE} -O /MCserver/run_${MC_VERSION}.sh
 fi

 sleep 1
--- a/1.16.2/files/Install_Script.sh
+++ b/1.16.2/files/Install_Script.sh
@@ -7,6 +7,8 @@ echo " "
 echo "INFO ! Checking for latest Minecraft Server version."
 MC_VERSION_OLD=1.16.1
 MC_VERSION=1.16.2
+MC_SERVER_FILE=https://launcher.mojang.com/v1/objects/c5f6fb23c3876461d46ec380421e42b289789530/server.jar
+MC_RUN_FILE=https://raw.githubusercontent.com/fithwum/minecraft/master/${MC_VERSION}/files/run.sh

 # Main install (Debian).
 # Check for files in /MCserver and download if needed.
@@ -22,7 +24,7 @@ if [ -e /MCserver/MCserver_${MC_VERSION}.jar ]
 			mkdir /MCserver/old-server-versions/${MC_VERSION_OLD}
 			mv /MCserver/MCserver_${MC_VERSION_OLD}.jar /MCserver/old-server-versions/${MC_VERSION_OLD}
 			mv /MCserver/run_${MC_VERSION_OLD}.sh /MCserver/old-server-versions/${MC_VERSION_OLD}
-			wget --no-cache https://launcher.mojang.com/v1/objects/c5f6fb23c3876461d46ec380421e42b289789530/server.jar -O /MCserver/MCserver_${MC_VERSION}.jar
+			wget --no-cache ${MC_SERVER_FILE} -O /MCserver/MCserver_${MC_VERSION}.jar
 fi

 sleep 1
@@ -36,7 +38,7 @@ if [ -e /MCserver/run_${MC_VERSION}.sh ]
 		echo " "
 		echo "WARNING ! run_${MC_VERSION_OLD}.sh is out of date/missing ... will download now."
 		mv /MCserver/run_${MC_VERSION_OLD}.sh /MCserver/old-server-versions/${MC_VERSION_OLD}
-		wget --no-cache https://raw.githubusercontent.com/fithwum/minecraft/master/files/run.sh -O /MCserver/run_${MC_VERSION}.sh
+		wget --no-cache ${MC_RUN_FILE} -O /MCserver/run_${MC_VERSION}.sh
 fi

 sleep 1
--- a/1.16.3/files/Install_Script.sh
+++ b/1.16.3/files/Install_Script.sh
@@ -7,6 +7,8 @@ echo " "
 echo "INFO ! Checking for latest Minecraft Server version."
 MC_VERSION_OLD=1.16.2
 MC_VERSION=1.16.3
+MC_SERVER_FILE=https://launcher.mojang.com/v1/objects/f02f4473dbf152c23d7d484952121db0b36698cb/server.jar
+MC_RUN_FILE=https://raw.githubusercontent.com/fithwum/minecraft/master/${MC_VERSION}/files/run.sh

 # Main install (Debian).
 # Check for files in /MCserver and download if needed.
@@ -22,7 +24,7 @@ if [ -e /MCserver/MCserver_${MC_VERSION}.jar ]
 			mkdir /MCserver/old-server-versions/${MC_VERSION_OLD}
 			mv /MCserver/MCserver_${MC_VERSION_OLD}.jar /MCserver/old-server-versions/${MC_VERSION_OLD}
 			mv /MCserver/run_${MC_VERSION_OLD}.sh /MCserver/old-server-versions/${MC_VERSION_OLD}
-			wget --no-cache https://launcher.mojang.com/v1/objects/f02f4473dbf152c23d7d484952121db0b36698cb/server.jar -O /MCserver/MCserver_${MC_VERSION}.jar
+			wget --no-cache ${MC_SERVER_FILE} -O /MCserver/MCserver_${MC_VERSION}.jar
 fi

 sleep 1
@@ -36,7 +38,7 @@ if [ -e /MCserver/run_${MC_VERSION}.sh ]
 		echo " "
 		echo "WARNING ! run_${MC_VERSION_OLD}.sh is out of date/missing ... will download now."
 		mv /MCserver/run_${MC_VERSION_OLD}.sh /MCserver/old-server-versions/${MC_VERSION_OLD}
-		wget --no-cache https://raw.githubusercontent.com/fithwum/minecraft/master/files/run.sh -O /MCserver/run_${MC_VERSION}.sh
+		wget --no-cache ${MC_RUN_FILE} -O /MCserver/run_${MC_VERSION}.sh
 fi

 sleep 1
--- a/1.16.4/files/Install_Script.sh
+++ b/1.16.4/files/Install_Script.sh
@@ -7,6 +7,8 @@ echo " "
 echo "INFO ! Checking for latest Minecraft Server version."
 MC_VERSION_OLD=1.16.3
 MC_VERSION=1.16.4
+MC_SERVER_FILE=https://launcher.mojang.com/v1/objects/35139deedbd5182953cf1caa23835da59ca3d7cd/server.jar
+MC_RUN_FILE=https://raw.githubusercontent.com/fithwum/minecraft/master/${MC_VERSION}/files/run.sh

 # Main install (Debian).
 # Check for files in /MCserver and download if needed.
@@ -22,7 +24,7 @@ if [ -e /MCserver/MCserver_${MC_VERSION}.jar ]
 			mkdir /MCserver/old-server-versions/${MC_VERSION_OLD}
 			mv /MCserver/MCserver_${MC_VERSION_OLD}.jar /MCserver/old-server-versions/${MC_VERSION_OLD}
 			mv /MCserver/run_${MC_VERSION_OLD}.sh /MCserver/old-server-versions/${MC_VERSION_OLD}
-			wget --no-cache https://launcher.mojang.com/v1/objects/35139deedbd5182953cf1caa23835da59ca3d7cd/server.jar -O /MCserver/MCserver_${MC_VERSION}.jar
+			wget --no-cache ${MC_SERVER_FILE} -O /MCserver/MCserver_${MC_VERSION}.jar
 fi

 sleep 1
@@ -36,7 +38,7 @@ if [ -e /MCserver/run_${MC_VERSION}.sh ]
 		echo " "
 		echo "WARNING ! run_${MC_VERSION_OLD}.sh is out of date/missing ... will download now."
 		mv /MCserver/run_${MC_VERSION_OLD}.sh /MCserver/old-server-versions/${MC_VERSION_OLD}
-		wget --no-cache https://raw.githubusercontent.com/fithwum/minecraft/master/files/run.sh -O /MCserver/run_${MC_VERSION}.sh
+		wget --no-cache ${MC_RUN_FILE} -O /MCserver/run_${MC_VERSION}.sh
 fi

 sleep 1
--- a/1.16.5/files/Install_Script.sh
+++ b/1.16.5/files/Install_Script.sh
@@ -7,6 +7,8 @@ echo " "
 echo "INFO ! Checking for latest Minecraft Server version."
 MC_VERSION_OLD=1.16.4
 MC_VERSION=1.16.5
+MC_SERVER_FILE=https://launcher.mojang.com/v1/objects/1b557e7b033b583cd9f66746b7a9ab1ec1673ced/server.jar
+MC_RUN_FILE=https://raw.githubusercontent.com/fithwum/minecraft/master/${MC_VERSION}/files/run.sh

 # Main install (Debian).
 # Check for files in /MCserver and download if needed.
@@ -22,7 +24,7 @@ if [ -e /MCserver/MCserver_${MC_VERSION}.jar ]
 			mkdir /MCserver/old-server-versions/${MC_VERSION_OLD}
 			mv /MCserver/MCserver_${MC_VERSION_OLD}.jar /MCserver/old-server-versions/${MC_VERSION_OLD}
 			mv /MCserver/run_${MC_VERSION_OLD}.sh /MCserver/old-server-versions/${MC_VERSION_OLD}
-			wget --no-cache https://launcher.mojang.com/v1/objects/1b557e7b033b583cd9f66746b7a9ab1ec1673ced/server.jar -O /MCserver/MCserver_${MC_VERSION}.jar
+			wget --no-cache ${MC_SERVER_FILE} -O /MCserver/MCserver_${MC_VERSION}.jar
 fi

 sleep 1
@@ -36,7 +38,7 @@ if [ -e /MCserver/run_${MC_VERSION}.sh ]
 		echo " "
 		echo "WARNING ! run_${MC_VERSION_OLD}.sh is out of date/missing ... will download now."
 		mv /MCserver/run_${MC_VERSION_OLD}.sh /MCserver/old-server-versions/${MC_VERSION_OLD}
-		wget --no-cache https://raw.githubusercontent.com/fithwum/minecraft/master/files/run.sh -O /MCserver/run_${MC_VERSION}.sh
+		wget --no-cache ${MC_RUN_FILE} -O /MCserver/run_${MC_VERSION}.sh
 fi

 sleep 1
--- a/1.16/files/Install_Script.sh
+++ b/1.16/files/Install_Script.sh
@@ -7,6 +7,8 @@ echo " "
 echo "INFO ! Checking for latest Minecraft Server version."
 MC_VERSION_OLD=1.15.2
 MC_VERSION=1.16
+MC_SERVER_FILE=https://launcher.mojang.com/v1/objects/a0d03225615ba897619220e256a266cb33a44b6b/server.jar
+MC_RUN_FILE=https://raw.githubusercontent.com/fithwum/minecraft/master/${MC_VERSION}/files/run.sh

 # Main install (Debian).
 # Check for files in /MCserver and download if needed.
@@ -22,7 +24,7 @@ if [ -e /MCserver/MCserver_${MC_VERSION}.jar ]
 			mkdir /MCserver/old-server-versions/${MC_VERSION_OLD}
 			mv /MCserver/MCserver_${MC_VERSION_OLD}.jar /MCserver/old-server-versions/${MC_VERSION_OLD}
 			mv /MCserver/run_${MC_VERSION_OLD}.sh /MCserver/old-server-versions/${MC_VERSION_OLD}
-			wget --no-cache https://launcher.mojang.com/v1/objects/a0d03225615ba897619220e256a266cb33a44b6b/server.jar -O /MCserver/MCserver_${MC_VERSION}.jar
+			wget --no-cache ${MC_SERVER_FILE} -O /MCserver/MCserver_${MC_VERSION}.jar
 fi

 sleep 1
@@ -36,7 +38,7 @@ if [ -e /MCserver/run_${MC_VERSION}.sh ]
 		echo " "
 		echo "WARNING ! run_${MC_VERSION_OLD}.sh is out of date/missing ... will download now."
 		mv /MCserver/run_${MC_VERSION_OLD}.sh /MCserver/old-server-versions/${MC_VERSION_OLD}
-		wget --no-cache https://raw.githubusercontent.com/fithwum/minecraft/master/files/run.sh -O /MCserver/run_${MC_VERSION}.sh
+		wget --no-cache ${MC_RUN_FILE} -O /MCserver/run_${MC_VERSION}.sh
 fi

 sleep 1
--- a/1.17.1/files/Install_Script.sh
+++ b/1.17.1/files/Install_Script.sh
@@ -7,6 +7,8 @@ echo " "
 echo "INFO ! Checking for latest Minecraft Server version."
 MC_VERSION_OLD=1.17
 MC_VERSION=1.17.1
+MC_SERVER_FILE=https://launcher.mojang.com/v1/objects/a16d67e5807f57fc4e550299cf20226194497dc2/server.jar
+MC_RUN_FILE=https://raw.githubusercontent.com/fithwum/minecraft/master/${MC_VERSION}/files/run.sh

 # Main install (Debian).
 # Check for files in /MCserver and download if needed.
@@ -22,7 +24,7 @@ if [ -e /MCserver/MCserver_${MC_VERSION}.jar ]
 			mkdir /MCserver/old-server-versions/${MC_VERSION_OLD}
 			mv /MCserver/MCserver_${MC_VERSION_OLD}.jar /MCserver/old-server-versions/${MC_VERSION_OLD}
 			mv /MCserver/run_${MC_VERSION_OLD}.sh /MCserver/old-server-versions/${MC_VERSION_OLD}
-			wget --no-cache https://launcher.mojang.com/v1/objects/a16d67e5807f57fc4e550299cf20226194497dc2/server.jar -O /MCserver/MCserver_${MC_VERSION}.jar
+			wget --no-cache ${MC_SERVER_FILE} -O /MCserver/MCserver_${MC_VERSION}.jar
 fi

 sleep 1
@@ -36,7 +38,7 @@ if [ -e /MCserver/run_${MC_VERSION}.sh ]
 		echo " "
 		echo "WARNING ! run_${MC_VERSION_OLD}.sh is out of date/missing ... will download now."
 		mv /MCserver/run_${MC_VERSION_OLD}.sh /MCserver/old-server-versions/${MC_VERSION_OLD}
-		wget --no-cache https://raw.githubusercontent.com/fithwum/minecraft/master/files/run.sh -O /MCserver/run_${MC_VERSION}.sh
+		wget --no-cache ${MC_RUN_FILE} -O /MCserver/run_${MC_VERSION}.sh
 fi

 sleep 1
--- a/1.17/files/Install_Script.sh
+++ b/1.17/files/Install_Script.sh
@@ -7,6 +7,8 @@ echo " "
 echo "INFO ! Checking for latest Minecraft Server version."
 MC_VERSION_OLD=1.16.5
 MC_VERSION=1.17
+MC_SERVER_FILE=https://launcher.mojang.com/v1/objects/0a269b5f2c5b93b1712d0f5dc43b6182b9ab254e/server.jar
+MC_RUN_FILE=https://raw.githubusercontent.com/fithwum/minecraft/master/${MC_VERSION}/files/run.sh

 # Main install (Debian).
 # Check for files in /MCserver and download if needed.
@@ -22,7 +24,7 @@ if [ -e /MCserver/MCserver_${MC_VERSION}.jar ]
 			mkdir /MCserver/old-server-versions/${MC_VERSION_OLD}
 			mv /MCserver/MCserver_${MC_VERSION_OLD}.jar /MCserver/old-server-versions/${MC_VERSION_OLD}
 			mv /MCserver/run_${MC_VERSION_OLD}.sh /MCserver/old-server-versions/${MC_VERSION_OLD}
-			wget --no-cache https://launcher.mojang.com/v1/objects/0a269b5f2c5b93b1712d0f5dc43b6182b9ab254e/server.jar -O /MCserver/MCserver_${MC_VERSION}.jar
+			wget --no-cache ${MC_SERVER_FILE} -O /MCserver/MCserver_${MC_VERSION}.jar
 fi

 sleep 1
@@ -36,7 +38,7 @@ if [ -e /MCserver/run_${MC_VERSION}.sh ]
 		echo " "
 		echo "WARNING ! run_${MC_VERSION_OLD}.sh is out of date/missing ... will download now."
 		mv /MCserver/run_${MC_VERSION_OLD}.sh /MCserver/old-server-versions/${MC_VERSION_OLD}
-		wget --no-cache https://raw.githubusercontent.com/fithwum/minecraft/master/files/run.sh -O /MCserver/run_${MC_VERSION}.sh
+		wget --no-cache ${MC_RUN_FILE} -O /MCserver/run_${MC_VERSION}.sh
 fi

 sleep 1
--- a/1.18.1/files/Install_Script.sh
+++ b/1.18.1/files/Install_Script.sh
@@ -7,6 +7,8 @@ echo " "
 echo "INFO ! Checking for latest Minecraft Server version."
 MC_VERSION_OLD=1.18
 MC_VERSION=1.18.1
+MC_SERVER_FILE=https://launcher.mojang.com/v1/objects/125e5adf40c659fd3bce3e66e67a16bb49ecc1b9/server.jar
+MC_RUN_FILE=https://raw.githubusercontent.com/fithwum/minecraft/master/${MC_VERSION}/files/run.sh

 # Main install (Debian).
 # Check for files in /MCserver and download if needed.
@@ -22,7 +24,7 @@ if [ -e /MCserver/MCserver_${MC_VERSION}.jar ]
 			mkdir /MCserver/old-server-versions/${MC_VERSION_OLD}
 			mv /MCserver/MCserver_${MC_VERSION_OLD}.jar /MCserver/old-server-versions/${MC_VERSION_OLD}
 			mv /MCserver/run_${MC_VERSION_OLD}.sh /MCserver/old-server-versions/${MC_VERSION_OLD}
-			wget --no-cache https://launcher.mojang.com/v1/objects/125e5adf40c659fd3bce3e66e67a16bb49ecc1b9/server.jar -O /MCserver/MCserver_${MC_VERSION}.jar
+			wget --no-cache ${MC_SERVER_FILE} -O /MCserver/MCserver_${MC_VERSION}.jar
 fi

 sleep 1
@@ -36,7 +38,7 @@ if [ -e /MCserver/run_${MC_VERSION}.sh ]
 		echo " "
 		echo "WARNING ! run_${MC_VERSION_OLD}.sh is out of date/missing ... will download now."
 		mv /MCserver/run_${MC_VERSION_OLD}.sh /MCserver/old-server-versions/${MC_VERSION_OLD}
-		wget --no-cache https://raw.githubusercontent.com/fithwum/minecraft/master/files/run.sh -O /MCserver/run_${MC_VERSION}.sh
+		wget --no-cache ${MC_RUN_FILE} -O /MCserver/run_${MC_VERSION}.sh
 fi

 sleep 1
--- a/1.18.2/files/Install_Script.sh
+++ b/1.18.2/files/Install_Script.sh
@@ -7,6 +7,8 @@ echo " "
 echo "INFO ! Checking for latest Minecraft Server version."
 MC_VERSION_OLD=1.18.1
 MC_VERSION=1.18.2
+MC_SERVER_FILE=https://launcher.mojang.com/v1/objects/c8f83c5655308435b3dcf03c06d9fe8740a77469/server.jar
+MC_RUN_FILE=https://raw.githubusercontent.com/fithwum/minecraft/master/${MC_VERSION}/files/run.sh

 # Main install (Debian).
 # Check for files in /MCserver and download if needed.
@@ -22,7 +24,7 @@ if [ -e /MCserver/MCserver_${MC_VERSION}.jar ]
 			mkdir /MCserver/old-server-versions/${MC_VERSION_OLD}
 			mv /MCserver/MCserver_${MC_VERSION_OLD}.jar /MCserver/old-server-versions/${MC_VERSION_OLD}
 			mv /MCserver/run_${MC_VERSION_OLD}.sh /MCserver/old-server-versions/${MC_VERSION_OLD}
-			wget --no-cache https://launcher.mojang.com/v1/objects/c8f83c5655308435b3dcf03c06d9fe8740a77469/server.jar -O /MCserver/MCserver_${MC_VERSION}.jar
+			wget --no-cache ${MC_SERVER_FILE} -O /MCserver/MCserver_${MC_VERSION}.jar
 fi

 sleep 1
@@ -36,7 +38,7 @@ if [ -e /MCserver/run_${MC_VERSION}.sh ]
 		echo " "
 		echo "WARNING ! run_${MC_VERSION_OLD}.sh is out of date/missing ... will download now."
 		mv /MCserver/run_${MC_VERSION_OLD}.sh /MCserver/old-server-versions/${MC_VERSION_OLD}
-		wget --no-cache https://raw.githubusercontent.com/fithwum/minecraft/master/files/run.sh -O /MCserver/run_${MC_VERSION}.sh
+		wget --no-cache ${MC_RUN_FILE} -O /MCserver/run_${MC_VERSION}.sh
 fi

 sleep 1
--- a/1.18/files/Install_Script.sh
+++ b/1.18/files/Install_Script.sh
@@ -7,6 +7,8 @@ echo " "
 echo "INFO ! Checking for latest Minecraft Server version."
 MC_VERSION_OLD=1.17.1
 MC_VERSION=1.18
+MC_SERVER_FILE=https://launcher.mojang.com/v1/objects/3cf24a8694aca6267883b17d934efacc5e44440d/server.jar
+MC_RUN_FILE=https://raw.githubusercontent.com/fithwum/minecraft/master/${MC_VERSION}/files/run.sh

 # Main install (Debian).
 # Check for files in /MCserver and download if needed.
@@ -22,7 +24,7 @@ if [ -e /MCserver/MCserver_${MC_VERSION}.jar ]
 			mkdir /MCserver/old-server-versions/${MC_VERSION_OLD}
 			mv /MCserver/MCserver_${MC_VERSION_OLD}.jar /MCserver/old-server-versions/${MC_VERSION_OLD}
 			mv /MCserver/run_${MC_VERSION_OLD}.sh /MCserver/old-server-versions/${MC_VERSION_OLD}
-			wget --no-cache https://launcher.mojang.com/v1/objects/3cf24a8694aca6267883b17d934efacc5e44440d/server.jar -O /MCserver/MCserver_${MC_VERSION}.jar
+			wget --no-cache ${MC_SERVER_FILE} -O /MCserver/MCserver_${MC_VERSION}.jar
 fi

 sleep 1
@@ -36,7 +38,7 @@ if [ -e /MCserver/run_${MC_VERSION}.sh ]
 		echo " "
 		echo "WARNING ! run_${MC_VERSION_OLD}.sh is out of date/missing ... will download now."
 		mv /MCserver/run_${MC_VERSION_OLD}.sh /MCserver/old-server-versions/${MC_VERSION_OLD}
-		wget --no-cache https://raw.githubusercontent.com/fithwum/minecraft/master/files/run.sh -O /MCserver/run_${MC_VERSION}.sh
+		wget --no-cache ${MC_RUN_FILE} -O /MCserver/run_${MC_VERSION}.sh
 fi

 sleep 1
--- a/1.19.1/files/Install_Script.sh
+++ b/1.19.1/files/Install_Script.sh
@@ -7,6 +7,8 @@ echo " "
 echo "INFO ! Checking for latest Minecraft Server version."
 MC_VERSION_OLD=1.19
 MC_VERSION=1.19.1
+MC_SERVER_FILE=https://piston-data.mojang.com/v1/objects/8399e1211e95faa421c1507b322dbeae86d604df/server.jar
+MC_RUN_FILE=https://raw.githubusercontent.com/fithwum/minecraft/master/${MC_VERSION}/files/run.sh

 # Main install (Debian).
 # Check for files in /MCserver and download if needed.
@@ -22,7 +24,7 @@ if [ -e /MCserver/MCserver_${MC_VERSION}.jar ]
 			mkdir /MCserver/old-server-versions/${MC_VERSION_OLD}
 			mv /MCserver/MCserver_${MC_VERSION_OLD}.jar /MCserver/old-server-versions/${MC_VERSION_OLD}
 			mv /MCserver/run_${MC_VERSION_OLD}.sh /MCserver/old-server-versions/${MC_VERSION_OLD}
-			wget --no-cache https://piston-data.mojang.com/v1/objects/8399e1211e95faa421c1507b322dbeae86d604df/server.jar -O /MCserver/MCserver_${MC_VERSION}.jar
+			wget --no-cache ${MC_SERVER_FILE} -O /MCserver/MCserver_${MC_VERSION}.jar
 fi

 sleep 1
@@ -36,7 +38,7 @@ if [ -e /MCserver/run_${MC_VERSION}.sh ]
 		echo " "
 		echo "WARNING ! run_${MC_VERSION_OLD}.sh is out of date/missing ... will download now."
 		mv /MCserver/run_${MC_VERSION_OLD}.sh /MCserver/old-server-versions/${MC_VERSION_OLD}
-		wget --no-cache https://raw.githubusercontent.com/fithwum/minecraft/master/files/run.sh -O /MCserver/run_${MC_VERSION}.sh
+		wget --no-cache ${MC_RUN_FILE} -O /MCserver/run_${MC_VERSION}.sh
 fi

 sleep 1
--- a/1.19.2/files/Install_Script.sh
+++ b/1.19.2/files/Install_Script.sh
@@ -7,6 +7,8 @@ echo " "
 echo "INFO ! Checking for latest Minecraft Server version."
 MC_VERSION_OLD=1.19.1
 MC_VERSION=1.19.2
+MC_SERVER_FILE=https://piston-data.mojang.com/v1/objects/f69c284232d7c7580bd89a5a4931c3581eae1378/server.jar
+MC_RUN_FILE=https://raw.githubusercontent.com/fithwum/minecraft/master/${MC_VERSION}/files/run.sh

 # Main install (Debian).
 # Check for files in /MCserver and download if needed.
@@ -22,7 +24,7 @@ if [ -e /MCserver/MCserver_${MC_VERSION}.jar ]
 			mkdir /MCserver/old-server-versions/${MC_VERSION_OLD}
 			mv /MCserver/MCserver_${MC_VERSION_OLD}.jar /MCserver/old-server-versions/${MC_VERSION_OLD}
 			mv /MCserver/run_${MC_VERSION_OLD}.sh /MCserver/old-server-versions/${MC_VERSION_OLD}
-			wget --no-cache https://piston-data.mojang.com/v1/objects/f69c284232d7c7580bd89a5a4931c3581eae1378/server.jar -O /MCserver/MCserver_${MC_VERSION}.jar
+			wget --no-cache ${MC_SERVER_FILE} -O /MCserver/MCserver_${MC_VERSION}.jar
 fi

 sleep 1
@@ -36,7 +38,7 @@ if [ -e /MCserver/run_${MC_VERSION}.sh ]
 		echo " "
 		echo "WARNING ! run_${MC_VERSION_OLD}.sh is out of date/missing ... will download now."
 		mv /MCserver/run_${MC_VERSION_OLD}.sh /MCserver/old-server-versions/${MC_VERSION_OLD}
-		wget --no-cache https://raw.githubusercontent.com/fithwum/minecraft/master/files/run.sh -O /MCserver/run_${MC_VERSION}.sh
+		wget --no-cache ${MC_RUN_FILE} -O /MCserver/run_${MC_VERSION}.sh
 fi

 sleep 1
--- a/1.19.3/files/Install_Script.sh
+++ b/1.19.3/files/Install_Script.sh
@@ -7,6 +7,8 @@ echo " "
 echo "INFO ! Checking for latest Minecraft Server version."
 MC_VERSION_OLD=1.19.2
 MC_VERSION=1.19.3
+MC_SERVER_FILE=https://piston-data.mojang.com/v1/objects/c9df48efed58511cdd0213c56b9013a7b5c9ac1f/server.jar
+MC_RUN_FILE=https://raw.githubusercontent.com/fithwum/minecraft/master/${MC_VERSION}/files/run.sh

 # Main install (Debian).
 # Check for files in /MCserver and download if needed.
@@ -22,7 +24,7 @@ if [ -e /MCserver/MCserver_${MC_VERSION}.jar ]
 			mkdir /MCserver/old-server-versions/${MC_VERSION_OLD}
 			mv /MCserver/MCserver_${MC_VERSION_OLD}.jar /MCserver/old-server-versions/${MC_VERSION_OLD}
 			mv /MCserver/run_${MC_VERSION_OLD}.sh /MCserver/old-server-versions/${MC_VERSION_OLD}
-			wget --no-cache https://piston-data.mojang.com/v1/objects/c9df48efed58511cdd0213c56b9013a7b5c9ac1f/server.jar -O /MCserver/MCserver_${MC_VERSION}.jar
+			wget --no-cache ${MC_SERVER_FILE} -O /MCserver/MCserver_${MC_VERSION}.jar
 fi

 sleep 1
@@ -36,7 +38,7 @@ if [ -e /MCserver/run_${MC_VERSION}.sh ]
 		echo " "
 		echo "WARNING ! run_${MC_VERSION_OLD}.sh is out of date/missing ... will download now."
 		mv /MCserver/run_${MC_VERSION_OLD}.sh /MCserver/old-server-versions/${MC_VERSION_OLD}
-		wget --no-cache https://raw.githubusercontent.com/fithwum/minecraft/master/files/run.sh -O /MCserver/run_${MC_VERSION}.sh
+		wget --no-cache ${MC_RUN_FILE} -O /MCserver/run_${MC_VERSION}.sh
 fi

 sleep 1
--- a/1.19/files/Install_Script.sh
+++ b/1.19/files/Install_Script.sh
@@ -7,6 +7,8 @@ echo " "
 echo "INFO ! Checking for latest Minecraft Server version."
 MC_VERSION_OLD=1.18.2
 MC_VERSION=1.19
+MC_SERVER_FILE=https://launcher.mojang.com/v1/objects/e00c4052dac1d59a1188b2aa9d5a87113aaf1122/server.jar
+MC_RUN_FILE=https://raw.githubusercontent.com/fithwum/minecraft/master/${MC_VERSION}/files/run.sh

 # Main install (Debian).
 # Check for files in /MCserver and download if needed.
@@ -22,7 +24,7 @@ if [ -e /MCserver/MCserver_${MC_VERSION}.jar ]
 			mkdir /MCserver/old-server-versions/${MC_VERSION_OLD}
 			mv /MCserver/MCserver_${MC_VERSION_OLD}.jar /MCserver/old-server-versions/${MC_VERSION_OLD}
 			mv /MCserver/run_${MC_VERSION_OLD}.sh /MCserver/old-server-versions/${MC_VERSION_OLD}
-			wget --no-cache https://launcher.mojang.com/v1/objects/e00c4052dac1d59a1188b2aa9d5a87113aaf1122/server.jar -O /MCserver/MCserver_${MC_VERSION}.jar
+			wget --no-cache ${MC_SERVER_FILE} -O /MCserver/MCserver_${MC_VERSION}.jar
 fi

 sleep 1
@@ -36,7 +38,7 @@ if [ -e /MCserver/run_${MC_VERSION}.sh ]
 		echo " "
 		echo "WARNING ! run_${MC_VERSION_OLD}.sh is out of date/missing ... will download now."
 		mv /MCserver/run_${MC_VERSION_OLD}.sh /MCserver/old-server-versions/${MC_VERSION_OLD}
-		wget --no-cache https://raw.githubusercontent.com/fithwum/minecraft/master/files/run.sh -O /MCserver/run_${MC_VERSION}.sh
+		wget --no-cache ${MC_RUN_FILE} -O /MCserver/run_${MC_VERSION}.sh
 fi

 sleep 1
--- a/latest/files/Install_Script.sh
+++ b/latest/files/Install_Script.sh
@@ -7,6 +7,8 @@ echo " "
 echo "INFO ! Checking for latest Minecraft Server version."
 MC_VERSION_OLD=1.19.3
 MC_VERSION=1.19.4
+MC_SERVER_FILE=https://piston-data.mojang.com/v1/objects/8f3112a1049751cc472ec13e397eade5336ca7ae/server.jar
+MC_RUN_FILE=https://raw.githubusercontent.com/fithwum/minecraft/master/${MC_VERSION}/files/run.sh

 # Main install (Debian).
 # Check for files in /MCserver and download if needed.
@@ -22,7 +24,7 @@ if [ -e /MCserver/MCserver_${MC_VERSION}.jar ]
 			mkdir /MCserver/old-server-versions/${MC_VERSION_OLD}
 			mv /MCserver/MCserver_${MC_VERSION_OLD}.jar /MCserver/old-server-versions/${MC_VERSION_OLD}
 			mv /MCserver/run_${MC_VERSION_OLD}.sh /MCserver/old-server-versions/${MC_VERSION_OLD}
-			wget --no-cache https://piston-data.mojang.com/v1/objects/8f3112a1049751cc472ec13e397eade5336ca7ae/server.jar -O /MCserver/MCserver_${MC_VERSION}.jar
+			wget --no-cache ${MC_SERVER_FILE} -O /MCserver/MCserver_${MC_VERSION}.jar
 fi

 sleep 1
@@ -36,7 +38,7 @@ if [ -e /MCserver/run_${MC_VERSION}.sh ]
 		echo " "
 		echo "WARNING ! run_${MC_VERSION_OLD}.sh is out of date/missing ... will download now."
 		mv /MCserver/run_${MC_VERSION_OLD}.sh /MCserver/old-server-versions/${MC_VERSION_OLD}
-		wget --no-cache https://raw.githubusercontent.com/fithwum/minecraft/master/files/run.sh -O /MCserver/run_${MC_VERSION}.sh
+		wget --no-cache ${MC_RUN_FILE} -O /MCserver/run_${MC_VERSION}.sh
 fi

 sleep 1