fithwum/minecraft
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

version change test

Browse Source
This commit is contained in:
fithwum
2023-11-08 12:09:45 -08:00
parent 81cc650816
commit 856b44e4c8
3 changed files with 44 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
fabric/fabric-1.18/Dockerfile
View File

@@ -3,6 +3,9 @@ LABEL maintainer "fithwum"
ENV ACCEPT_EULA="false" ENV ACCEPT_EULA="false"
ENV GAME_PORT="25565" ENV GAME_PORT="25565"
ENV MC_VERSION="1.18"
ENV FABRIC_VERSION=""
ENV INSTALLER_VERSION="0.11.2"
# URL's for files # URL's for files
ARG INSTALL_SCRIPT=https://gitlab.fithwum.tech/fithwum/minecraft/-/raw/master/fabric/fabric-1.18/files/Install_Script.sh ARG INSTALL_SCRIPT=https://gitlab.fithwum.tech/fithwum/minecraft/-/raw/master/fabric/fabric-1.18/files/Install_Script.sh

82
fabric/fabric-1.18/files/Install_Script.sh
View File

@@ -5,20 +5,10 @@
# Display setup # Display setup
export DISPLAY=0 export DISPLAY=0
# Variables. # Main Install Links
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
SERVER_FILE=https://meta.fabricmc.net/v2/versions/loader/${MC_VERSION}/${FABRIC_VERSION}/${INSTALLER_VERSION}/server/jar 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 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). # Main install (Debian).
# Check for files in /MCserver and download if needed. # Check for files in /MCserver and download if needed.
if [ -e /MCserver/fabric-${MC_VERSION}-${FABRIC_VERSION}.jar ] if [ -e /MCserver/fabric-${MC_VERSION}-${FABRIC_VERSION}.jar ]
@@ -31,8 +21,8 @@ if [ -e /MCserver/fabric-${MC_VERSION}-${FABRIC_VERSION}.jar ]
echo " " echo " "
echo "INFO ! Cleaning old files." echo "INFO ! Cleaning old files."
mkdir /MCserver/old-server-versions mkdir /MCserver/old-server-versions
mv /MCserver/fabric-${MC_VERSION_OLD}-${FABRIC_VERSION}.jar /MCserver/old-server-versions/ mv /MCserver/fabric-*-*.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/
wget --no-cache ${SERVER_FILE} -O /MCserver/fabric-${MC_VERSION}-${FABRIC_VERSION}.jar wget --no-cache ${SERVER_FILE} -O /MCserver/fabric-${MC_VERSION}-${FABRIC_VERSION}.jar
fi 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." echo "INFO ! run-fabric_${MC_VERSION}.sh found ... will use existing file."
else else
echo " " echo " "
echo "WARNING ! run-fabric_${MC_VERSION_OLD}.sh is out of date/missing ... will download now." echo "WARNING ! run-fabric.sh is out of date/missing ... will download now."
mv /MCserver/run-fabric_${MC_VERSION_OLD}.sh /MCserver/old-server-versions/ mv /MCserver/run-fabric_*.sh /MCserver/old-server-versions/
wget --no-cache ${MC_RUN_FILE} -O /MCserver/run-fabric_${MC_VERSION}.sh wget --no-cache ${MC_RUN_FILE} -O /MCserver/run-fabric_${MC_VERSION}.sh
fi fi
# Check for needed files # Check for EULA
if [ -e /MCserver/eula.txt ] if [ ! -f /MCserver/eula.txt ]; then
then :
echo " " else
echo "INFO ! eula.txt found ... will use existing file." if [ "${ACCEPT_EULA}" == "false" ]; then
else if grep -rq 'eula=true' /MCserver/eula.txt; then
echo " " sed -i '/eula=true/c\eula=false' /MCserver/eula.txt
echo "WARNING ! eula.txt is missing ... will download now." fi
wget --no-cache ${EULA_FILE} -O /MCserver/eula.txt 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 fi
if [ -e /MCserver/ops.json ] sleep 1
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
if [ -e /MCserver/whitelist.json ] if [ ! -f /MCserver/eula.txt ]; then
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 " "
echo "INFO ! whitelist.json found ... will use existing file." echo "INFO ! EULA accepted, server restarting, please wait..."
else sleep 1
echo " " exec /MCserver/run_${MC_VERSION}.sh --dataPath=/MCserver
echo "WARNING ! whitelist.json is missing ... will download now." exit 0
wget --no-cache ${WHITELIST_FILE} -O /MCserver/whitelist.json 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 fi
sleep 1 sleep 1
@@ -95,4 +95,4 @@ echo " "
echo "INFO ! Starting Minecraft Server ${MC_VERSION}" echo "INFO ! Starting Minecraft Server ${MC_VERSION}"
exec /MCserver/run-fabric_${MC_VERSION}.sh --dataPath=/MCserver exec /MCserver/run-fabric_${MC_VERSION}.sh --dataPath=/MCserver
exit exit

3
fabric/fabric-1.18/files/eula.txt
View File

@@ -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