cleanup
This commit is contained in:
@@ -24,7 +24,7 @@ RUN apt-get -y update \
|
||||
RUN mkdir -p /MCserver /MCtemp \
|
||||
&& chmod 777 -R /MCserver /MCtemp \
|
||||
&& chown 99:100 -R /MCserver /MCtemp
|
||||
ADD "${INSTALL_SCRIPT}" /MCtemp
|
||||
ADD "$INSTALL_SCRIPT" /MCtemp
|
||||
RUN chmod +x /MCtemp/install_script.sh
|
||||
|
||||
# Directory where data is stored
|
||||
|
||||
@@ -6,46 +6,46 @@
|
||||
export DISPLAY=0
|
||||
|
||||
# Main Install Links
|
||||
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/fabric/run.sh
|
||||
|
||||
rm -fr /MCserver/run_*.sh
|
||||
|
||||
# Main install (Debian).
|
||||
# Check for files in /MCserver and download if needed.
|
||||
if [ -e /MCserver/fabric-${MC_VERSION}-${FABRIC_VERSION}.jar ]
|
||||
# Check for server files and download if needed.
|
||||
if [ -e /MCserver/fabric-$MC_VERSION-$FABRIC_VERSION.jar ]
|
||||
then
|
||||
echo " "
|
||||
echo "INFO ! fabric-${MC_VERSION}-${FABRIC_VERSION}.jar found starting now."
|
||||
echo "INFO ! fabric-$MC_VERSION-$FABRIC_VERSION.jar found starting now."
|
||||
else
|
||||
echo " "
|
||||
echo "WARNING ! fabric-${MC_VERSION}-${FABRIC_VERSION}.jar is out of date/missing ... will download now."
|
||||
echo "WARNING ! fabric-$MC_VERSION-$FABRIC_VERSION.jar is out of date/missing ... will download now."
|
||||
echo " "
|
||||
echo "INFO ! Cleaning old files."
|
||||
mkdir /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
|
||||
|
||||
sleep 1
|
||||
|
||||
# Looking for run-${MC_VERSION}.sh
|
||||
if [ -e /MCserver/run-${MC_VERSION}.sh ]
|
||||
# Looking for run.sh
|
||||
if [ -e /MCserver/run-$MC_VERSION.sh ]
|
||||
then
|
||||
echo " "
|
||||
echo "INFO ! run-${MC_VERSION}.sh found ... will use existing file."
|
||||
echo "INFO ! run-$MC_VERSION.sh found ... will use existing file."
|
||||
else
|
||||
echo " "
|
||||
echo "WARNING ! run-${MC_VERSION}.sh is out of date/missing ... will download now."
|
||||
echo "WARNING ! run-$MC_VERSION.sh is out of date/missing ... will download now."
|
||||
mv /MCserver/run-*.sh /MCserver/old-server-versions/
|
||||
wget --no-cache ${MC_RUN_FILE} -O /MCserver/run-${MC_VERSION}.sh
|
||||
wget --no-cache $MC_RUN_FILE -O /MCserver/run-$MC_VERSION.sh
|
||||
fi
|
||||
|
||||
# Check for EULA
|
||||
if [ ! -f /MCserver/eula.txt ]; then
|
||||
:
|
||||
else
|
||||
if [ "${ACCEPT_EULA}" == "false" ]; then
|
||||
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
|
||||
@@ -63,16 +63,16 @@ if [ ! -f /MCserver/eula.txt ]; then
|
||||
echo "WARNING ! EULA not found please stand by..."
|
||||
sleep 5
|
||||
fi
|
||||
if [ "${ACCEPT_EULA}" == "true" ]; then
|
||||
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
|
||||
exec /MCserver/run-$MC_VERSION.sh --dataPath=/MCserver
|
||||
exit 0
|
||||
fi
|
||||
elif [ "${ACCEPT_EULA}" == "false" ]; then
|
||||
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"
|
||||
@@ -87,14 +87,14 @@ sleep 1
|
||||
# Set permissions.
|
||||
chown 99:100 -R /MCserver
|
||||
chmod 777 -R /MCserver
|
||||
chmod +x /MCserver/run-${MC_VERSION}.sh
|
||||
chmod +x /MCserver/fabric-${MC_VERSION}-${FABRIC_VERSION}.jar
|
||||
chmod +x /MCserver/run-$MC_VERSION.sh
|
||||
chmod +x /MCserver/fabric-$MC_VERSION-$FABRIC_VERSION.jar
|
||||
|
||||
sleep 1
|
||||
|
||||
# Run Minecraft server.
|
||||
echo " "
|
||||
echo "INFO ! Starting Minecraft Server ${MC_VERSION}"
|
||||
exec /MCserver/run-${MC_VERSION}.sh --dataPath=/MCserver
|
||||
echo "INFO ! Starting Minecraft Server $MC_VERSION"
|
||||
exec /MCserver/run-$MC_VERSION.sh --dataPath=/MCserver
|
||||
|
||||
exit
|
||||
Reference in New Issue
Block a user