From 856b44e4c84202775c03edee1eec34d1197f170f Mon Sep 17 00:00:00 2001
From: fithwum <fithwum@hotmail.com>
Date: Wed, 8 Nov 2023 12:09:45 -0800
Subject: [PATCH] version change test

---
 fabric/fabric-1.18/Dockerfile              |  3 +
 fabric/fabric-1.18/files/Install_Script.sh | 82 +++++++++++-----------
 fabric/fabric-1.18/files/eula.txt          |  3 -
 3 files changed, 44 insertions(+), 44 deletions(-)
 delete mode 100644 fabric/fabric-1.18/files/eula.txt

diff --git a/fabric/fabric-1.18/Dockerfile b/fabric/fabric-1.18/Dockerfile
index 7c783a8..da18102 100644
--- a/fabric/fabric-1.18/Dockerfile
+++ b/fabric/fabric-1.18/Dockerfile
@@ -3,6 +3,9 @@ LABEL maintainer "fithwum"
 
 ENV ACCEPT_EULA="false"
 ENV GAME_PORT="25565"
+ENV MC_VERSION="1.18"
+ENV FABRIC_VERSION=""
+ENV INSTALLER_VERSION="0.11.2"
 
 # URL's for files
 ARG INSTALL_SCRIPT=https://gitlab.fithwum.tech/fithwum/minecraft/-/raw/master/fabric/fabric-1.18/files/Install_Script.sh
diff --git a/fabric/fabric-1.18/files/Install_Script.sh b/fabric/fabric-1.18/files/Install_Script.sh
index 7843db9..761d1ae 100644
--- a/fabric/fabric-1.18/files/Install_Script.sh
+++ b/fabric/fabric-1.18/files/Install_Script.sh
@@ -5,20 +5,10 @@
 # Display setup
 export DISPLAY=0
 
-# Variables.
-echo " "
-echo "INFO ! Checking for latest Minecraft Server version."
-MC_VERSION_OLD=
-FABRIC_VERSION_OLD=1.14.22
-MC_VERSION=1.18
-FABRIC_VERSION=0.14.24
-INSTALLER_VERSION=0.11.2
-
+# Main Install Links
 SERVER_FILE=https://meta.fabricmc.net/v2/versions/loader/${MC_VERSION}/${FABRIC_VERSION}/${INSTALLER_VERSION}/server/jar
 MC_RUN_FILE=https://gitlab.fithwum.tech/fithwum/minecraft/-/raw/master/files/run-fabric.sh
 
-EULA_FILE=https://gitlab.fithwum.tech/fithwum/minecraft/-/raw/master/fabric/fabric-${MC_VERSION}/files/eula.txt
-
 # Main install (Debian).
 # Check for files in /MCserver and download if needed.
 if [ -e /MCserver/fabric-${MC_VERSION}-${FABRIC_VERSION}.jar ]
@@ -31,8 +21,8 @@ if [ -e /MCserver/fabric-${MC_VERSION}-${FABRIC_VERSION}.jar ]
 			echo " "
 			echo "INFO ! Cleaning old files."
 			mkdir /MCserver/old-server-versions
-			mv /MCserver/fabric-${MC_VERSION_OLD}-${FABRIC_VERSION}.jar /MCserver/old-server-versions/
-			mv /MCserver/fabric-${MC_VERSION}-${FABRIC_VERSION_OLD}.jar /MCserver/old-server-versions/
+			mv /MCserver/fabric-*-*.jar /MCserver/old-server-versions/
+			mv /MCserver/fabric-*-*.jar /MCserver/old-server-versions/
 			wget --no-cache ${SERVER_FILE} -O /MCserver/fabric-${MC_VERSION}-${FABRIC_VERSION}.jar
 fi
 
@@ -45,40 +35,50 @@ if [ -e /MCserver/run-fabric_${MC_VERSION}.sh ]
 		echo "INFO ! run-fabric_${MC_VERSION}.sh found ... will use existing file."
 	else
 		echo " "
-		echo "WARNING ! run-fabric_${MC_VERSION_OLD}.sh is out of date/missing ... will download now."
-		mv /MCserver/run-fabric_${MC_VERSION_OLD}.sh /MCserver/old-server-versions/
+		echo "WARNING ! run-fabric.sh is out of date/missing ... will download now."
+		mv /MCserver/run-fabric_*.sh /MCserver/old-server-versions/
 		wget --no-cache ${MC_RUN_FILE} -O /MCserver/run-fabric_${MC_VERSION}.sh
 fi
 
-# Check for needed files
-if [ -e /MCserver/eula.txt ]
-	then
-		echo " "
-		echo "INFO ! eula.txt found ... will use existing file."
-	else
-		echo " "
-		echo "WARNING ! eula.txt is missing ... will download now."
-		wget --no-cache ${EULA_FILE} -O /MCserver/eula.txt
+# 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
 
-if [ -e /MCserver/ops.json ]
-	then
-		echo " "
-		echo "INFO ! ops.json found ... will use existing file."
-	else
-		echo " "
-		echo "WARNING ! ops.json is missing ... will download now."
-		wget --no-cache ${OPS_FILE} -O /MCserver/ops.json
-fi
+sleep 1
 
-if [ -e /MCserver/whitelist.json ]
-	then
+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 ! whitelist.json found ... will use existing file."
-	else
-		echo " "
-		echo "WARNING ! whitelist.json is missing ... will download now."
-		wget --no-cache ${WHITELIST_FILE} -O /MCserver/whitelist.json
+		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
@@ -95,4 +95,4 @@ echo " "
 echo "INFO ! Starting Minecraft Server ${MC_VERSION}"
 exec /MCserver/run-fabric_${MC_VERSION}.sh --dataPath=/MCserver
 
-exit
+exit
\ No newline at end of file
diff --git a/fabric/fabric-1.18/files/eula.txt b/fabric/fabric-1.18/files/eula.txt
deleted file mode 100644
index 9721c7a..0000000
--- a/fabric/fabric-1.18/files/eula.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-#By changing the setting below to TRUE you are indicating your agreement to our EULA (https://account.mojang.com/documents/minecraft_eula).
-#Mon Jul 13 15:34:07 PDT 2020
-eula=true