diff --git a/neoforged/Install_Script.sh b/neoforged/Install_Script.sh index b3069f7..92164f7 100644 --- a/neoforged/Install_Script.sh +++ b/neoforged/Install_Script.sh @@ -2,6 +2,8 @@ # Copyright (c) 2022 fithwum # All rights reserved +MC_DIR=/MCserver + # Main Install Links INSTALLER_FILE=https://maven.neoforged.net/releases/net/neoforged/neoforge/$NEOFORGED_VERSION-beta/neoforge-$NEOFORGED_VERSION-beta-installer.jar SERVER_FILE=https://github.com/neoforged/ServerStarterJar/releases/download/$SERVER_VERSION/server.jar @@ -9,19 +11,19 @@ MC_RUN_FILE=https://gitea.fithwum.tech/fithwum/minecraft/raw/branch/master/neofo # Main install (Debian). # Check for server files and download if needed. -# if [ -e /MCserver/run-$NEOFORGED_VERSION.sh ] +# if [ -e $MC_DIR/run-$NEOFORGED_VERSION.sh ] # then # echo " " # echo "INFO ! run-$NEOFORGED_VERSION.sh found ... will use existing file." # else # echo " " # echo "WARNING ! run-$NEOFORGED_VERSION.sh is out of date/missing ... will download now." -# rm -fr /MCserver/run-*.sh -# wget --no-cache --show-progress --progress=bar:force:noscroll $MC_RUN_FILE -O /MCserver/run-$NEOFORGED_VERSION.sh -# chmod +x /MCserver/run-$NEOFORGED_VERSION.sh +# rm -fr $MC_DIR/run-*.sh +# wget --no-cache --show-progress --progress=bar:force:noscroll $MC_RUN_FILE -O $MC_DIR/run-$NEOFORGED_VERSION.sh +# chmod +x $MC_DIR/run-$NEOFORGED_VERSION.sh # fi -if [ -e /MCserver/neoforge-$NEOFORGED_VERSION-beta-installer.jar ] +if [ -e $MC_DIR/neoforge-$NEOFORGED_VERSION-beta-installer.jar ] then echo " " echo "INFO ! neoforge-$NEOFORGED_VERSION-beta-installer.jar found starting now." @@ -30,7 +32,7 @@ if [ -e /MCserver/neoforge-$NEOFORGED_VERSION-beta-installer.jar ] echo "WARNING ! neoforge-$NEOFORGED_VERSION-beta-installer.jar is out of date/missing ... will download now." echo " " echo "INFO ! Cleaning old files." - cd /MCserver + cd $MC_DIR rm -fr neoforge-*.jar run-*.sh wget --no-cache --show-progress --progress=bar:force:noscroll $INSTALLER_FILE -O neoforge-$NEOFORGED_VERSION-beta-installer.jar chmod +x neoforge-$NEOFORGED_VERSION-beta-installer.jar @@ -40,7 +42,7 @@ if [ -e /MCserver/neoforge-$NEOFORGED_VERSION-beta-installer.jar ] cd .. fi -# if [ -e /MCserver/server-$SERVER_VERSION.jar ] +# if [ -e $MC_DIR/server-$SERVER_VERSION.jar ] # then # echo " " # echo "INFO ! server-$SERVER_VERSION.jar found starting now." @@ -49,20 +51,20 @@ fi # echo "WARNING ! server-$SERVER_VERSION.jar is out of date/missing ... will download now." # echo " " # echo "INFO ! Cleaning old files." -# rm -fr /MCserver/server-*.jar -# wget --no-cache --show-progress --progress=bar:force:noscroll $SERVER_FILE -O /MCserver/server-$SERVER_VERSION.jar -# chmod +x /MCserver/server-$SERVER_VERSION.jar +# rm -fr $MC_DIR/server-*.jar +# wget --no-cache --show-progress --progress=bar:force:noscroll $SERVER_FILE -O $MC_DIR/server-$SERVER_VERSION.jar +# chmod +x $MC_DIR/server-$SERVER_VERSION.jar # fi sleep 1 # Check for EULA -if [ ! -f /MCserver/eula.txt ]; then +if [ ! -f $MC_DIR/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 + if grep -rq 'eula=true' $MC_DIR/eula.txt; then + sed -i '/eula=true/c\eula=false' $MC_DIR/eula.txt fi echo " " echo "WARNING ! EULA not accepted, you must accept the EULA" @@ -73,18 +75,18 @@ fi sleep 1 -if [ ! -f /MCserver/eula.txt ]; then +if [ ! -f $MC_DIR/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 + if grep -rq 'eula=false' $MC_DIR/eula.txt; then + sed -i '/eula=false/c\eula=true' $MC_DIR/eula.txt echo " " echo "INFO ! EULA accepted, server restarting, please wait..." sleep 1 - exec /MCserver/run-$NEOFORGED_VERSION.sh --dataPath=/MCserver + exec .$MC_DIR/run-$NEOFORGED_VERSION.sh #--dataPath=$MC_DIR exit 0 fi elif [ "$ACCEPT_EULA" == "false" ]; then @@ -100,27 +102,42 @@ fi sleep 1 echo "INFO ! Setting game port." -sed -i '/server-port='*'/c\server-port='$GAME_PORT'' /MCserver/server.properties +sed -i '/server-port='*'/c\server-port='$GAME_PORT'' $MC_DIR/server.properties sleep 1 echo "INFO ! Setting java settings." -sed -i '/-Xmx='*'/c\-Xmx='$XMX_SIZE'' /MCserver/user_jvm_args.txt -sed -i '/-Xms='*'/c\-Xms='$XMS_SIZE'' /MCserver/user_jvm_args.txt -sed -i '/-Xmn='*'/c\-Xmn='$XMN_SIZE'' /MCserver/user_jvm_args.txt +# sed -i '/-Xmx='*'/c\-Xmx='$XMX_SIZE'' $MC_DIR/user_jvm_args.txt +# sed -i '/-Xms='*'/c\-Xms='$XMS_SIZE'' $MC_DIR/user_jvm_args.txt +# sed -i '/-Xmn='*'/c\-Xmn='$XMN_SIZE'' $MC_DIR/user_jvm_args.txt + +if [ ! -f $MC_DIR/user_jvm_args.txt ]; then + echo "Creating user_jvm_args.txt" + { + echo "-Xms$XMS_SIZE" + echo "-Xmx$XMX_SIZE" + [ -n "$XMN_SIZE" ] && echo "-Xmn$XMN_SIZE" + } > $MC_DIR/user_jvm_args.txt +else + sed -i "s/^-Xms.*/-Xms$XMS_SIZE/" $MC_DIR/user_jvm_args.txt + sed -i "s/^-Xmx.*/-Xmx$XMX_SIZE/" $MC_DIR/user_jvm_args.txt + if [ -n "$XMN_SIZE" ]; then + sed -i "s/^-Xmn.*/-Xmn$XMN_SIZE/" $MC_DIR/user_jvm_args.txt || true + fi +fi sleep 1 # Set permissions. -chown 99:100 -R /MCserver -chmod 777 -R /MCserver +chown 99:100 -R $MC_DIR +chmod 777 -R $MC_DIR sleep 1 # Run Minecraft server. echo " " echo "INFO ! Starting Minecraft Server $NEOFORGED_VERSION" -# cd /MCserver -exec /MCserver/run-$NEOFORGED_VERSION.sh #--dataPath=/MCserver +# cd $MC_DIR +exec .$MC_DIR/run-$NEOFORGED_VERSION.sh nogui #--dataPath=$MC_DIR exit \ No newline at end of file