remove old run files to auto generate them

bukkit/install_script.sh

@@ -8,7 +8,6 @@ EULA_MARKER=$MC_DIR/.eula_accepted
 
 # Main Install Links
 INSTALLER_FILE=https://cdn.getbukkit.org/craftbukkit/craftbukkit-$MC_VERSION.jar
-MC_RUN_FILE=https://gitea.fithwum.tech/fithwum/minecraft/raw/branch/master/bukkit/run.sh
 
 # Install java
 if dpkg -s openjdk-$JAVA_VERSION-jre-headless &> /dev/null
@@ -59,7 +58,21 @@ if [ -e $MC_DIR/run-$MC_VERSION.sh ]
 		echo " "
 		echo "WARNING ! run.sh is out of date/missing ... will download now."
 		mv $MC_DIR/run-*.sh $MC_DIR/old-server-versions/
-		wget --no-cache --show-progress --progress=bar:force:noscroll $MC_RUN_FILE -O $MC_DIR/run-$MC_VERSION.sh
+		tee $MC_DIR/run-$MC_VERSION.sh <<-EOF
+		#!/bin/bash
+		# Copyright (c) 2022 fithwum
+		# All rights reserved
+
+		cd /MCserver
+		JAR=./craftbukkit-*.jar
+
+		while [ true ]; do
+			java -Xmx$XMX_SIZE -Xms$XMS_SIZE -Xmn$XMN_SIZE -Dbungee.epoll=false -jar $JAR nogui
+			if [ $? -eq 0 ]; then
+				break
+			fi
+		done
+		EOF
 		chmod +x $MC_DIR/run-$MC_VERSION.sh
 fi
 

bukkit/run.sh

@@ -1,13 +0,0 @@
-#!/bin/bash
-# Copyright (c) 2022 fithwum
-# All rights reserved
-
-cd /MCserver
-JAR=./craftbukkit-*.jar
-
-while [ true ]; do
-  java -Xmx$XMX_SIZE -Xms$XMS_SIZE -Xmn$XMN_SIZE -jar $JAR nogui
-  if [ $? -eq 0 ]; then
-    break
-  fi
-done

fabric/install_script.sh

@@ -8,7 +8,6 @@ EULA_MARKER=$MC_DIR/.eula_accepted
 
 # Main Install Links
 SERVER_FILE=https://meta.fabricmc.net/v2/versions/loader/$MC_VERSION/$FABRIC_VERSION/$INSTALLER_VERSION/server/jar
-MC_RUN_FILE=https://gitea.fithwum.tech/fithwum/minecraft/raw/branch/master/fabric/run.sh
 
 # Install java
 if dpkg -s openjdk-$JAVA_VERSION-jre-headless &> /dev/null
@@ -59,7 +58,21 @@ if [ -e $MC_DIR/run-$MC_VERSION.sh ]
 		echo " "
 		echo "WARNING ! run-$MC_VERSION.sh is out of date/missing ... will download now."
 		mv $MC_DIR/run-*.sh $MC_DIR/old-server-versions/
-		wget --no-cache --show-progress --progress=bar:force:noscroll $MC_RUN_FILE -O $MC_DIR/run-$MC_VERSION.sh
+		tee $MC_DIR/run-$MC_VERSION.sh <<-EOF
+		#!/bin/bash
+		# Copyright (c) 2022 fithwum
+		# All rights reserved
+
+		cd /MCserver
+		JAR=./fabric-*-*.jar
+
+		while [ true ]; do
+			java -Xmx$XMX_SIZE -Xms$XMS_SIZE -Xmn$XMN_SIZE -Dbungee.epoll=false -jar $JAR nogui
+			if [ $? -eq 0 ]; then
+				break
+			fi
+		done
+		EOF
 		chmod +x $MC_DIR/run-$MC_VERSION.sh
 fi
 

fabric/run.sh

@@ -1,13 +0,0 @@
-#!/bin/bash
-# Copyright (c) 2022 fithwum
-# All rights reserved
-
-cd /MCserver
-JAR=./fabric-*-*.jar
-
-while [ true ]; do
-  java -Xmx$XMX_SIZE -Xms$XMS_SIZE -Xmn$XMN_SIZE -Dbungee.epoll=false -jar $JAR nogui
-  if [ $? -eq 0 ]; then
-    break
-  fi
-done

forge/Install_Script.sh

@@ -8,7 +8,6 @@ EULA_MARKER=$MC_DIR/.eula_accepted
 
 # Main Install Links
 INSTALLER_FILE=https://maven.minecraftforge.net/net/minecraftforge/forge/$MC_VERSION-$FORGE_VERSION/forge-$MC_VERSION-$FORGE_VERSION-installer.jar
-MC_RUN_FILE=https://gitea.fithwum.tech/fithwum/minecraft/raw/branch/master/neoforged/run.sh
 
 # Install java
 if dpkg -s openjdk-$JAVA_VERSION-jre-headless &> /dev/null
@@ -64,11 +63,11 @@ if [ -f $MC_DIR/server.properties ]; then
 fi
 
 echo "INFO ! Setting java settings."
-cat > $MC_DIR/user_jvm_args.txt <<EOF
+tee user_jvm_args.txt <<-EOF
 -Xmx${XMX_SIZE}
 -Xms${XMS_SIZE}
+-Xmn${XMN_SIZE}
 EOF
-[ -n "$XMN_SIZE" ] && echo "-Xmn${XMN_SIZE}" >> $MC_DIR/user_jvm_args.txt
 
 # Wait briefly for installer/server to generate eula.txt
 if [ ! -f "$EULA_FILE" ] && [ ! -f "$EULA_MARKER" ]; then

neoforged/Install_Script.sh

@@ -63,11 +63,11 @@ if [ -f $MC_DIR/server.properties ]; then
 fi
 
 echo "INFO ! Setting java settings."
-cat > $MC_DIR/user_jvm_args.txt <<EOF
+tee user_jvm_args.txt <<-EOF
 -Xmx${XMX_SIZE}
 -Xms${XMS_SIZE}
+-Xmn${XMN_SIZE}
 EOF
-[ -n "$XMN_SIZE" ] && echo "-Xmn${XMN_SIZE}" >> $MC_DIR/user_jvm_args.txt
 
 # Wait briefly for installer/server to generate eula.txt
 if [ ! -f "$EULA_FILE" ] && [ ! -f "$EULA_MARKER" ]; then

quilt/Install_Script.sh

@@ -8,7 +8,6 @@ EULA_MARKER=$MC_DIR/.eula_accepted
 
 # Main Install Links
 INSTALLER_FILE=https://quiltmc.org/api/v1/download-latest-installer/java-universal
-MC_RUN_FILE=https://gitea.fithwum.tech/fithwum/minecraft/raw/branch/master/quilt/run.sh
 
 # Install java
 if dpkg -s openjdk-$JAVA_VERSION-jre-headless &> /dev/null
@@ -69,6 +68,21 @@ if [ -e $MC_DIR/run-$MC_VERSION.sh ]
 		echo "WARNING ! run-$MC_VERSION.sh is out of date/missing ... will download now."
 		mv $MC_DIR/run-*.sh $MC_DIR/old-server-versions/
 		wget --no-cache --show-progress --progress=bar:force:noscroll $MC_RUN_FILE -O $MC_DIR/run-$MC_VERSION-$QUILT_VERSION.sh
+		tee $MC_DIR/run-$MC_VERSION-$QUILT_VERSION.sh <<-EOF
+		#!/bin/bash
+		# Copyright (c) 2022 fithwum
+		# All rights reserved
+
+		cd /MCserver
+		JAR=./quilt-server-launch.jar
+
+		while [ true ]; do
+			java -Xmx$XMX_SIZE -Xms$XMS_SIZE -Xmn$XMN_SIZE -Dbungee.epoll=false -jar $JAR nogui
+			if [ $? -eq 0 ]; then
+				break
+			fi
+		done
+		EOF
 		chmod +x $MC_DIR/run-$MC_VERSION-$QUILT_VERSION.sh
 fi
 
@@ -78,11 +92,11 @@ if [ -f $MC_DIR/server.properties ]; then
 fi
 
 echo "INFO ! Setting java settings."
-cat > $MC_DIR/user_jvm_args.txt <<EOF
+tee user_jvm_args.txt <<-EOF
 -Xmx${XMX_SIZE}
 -Xms${XMS_SIZE}
+-Xmn${XMN_SIZE}
 EOF
-[ -n "$XMN_SIZE" ] && echo "-Xmn${XMN_SIZE}" >> $MC_DIR/user_jvm_args.txt
 
 # Wait briefly for installer/server to generate eula.txt
 if [ ! -f "$EULA_FILE" ] && [ ! -f "$EULA_MARKER" ]; then

quilt/run.sh

@@ -1,13 +0,0 @@
-#!/bin/bash
-# Copyright (c) 2022 fithwum
-# All rights reserved
-
-cd /MCserver
-JAR=./quilt-server-launch.jar
-
-while [ true ]; do
-  java -Xmx$XMX_SIZE -Xms$XMS_SIZE -Xmn$XMN_SIZE -Dbungee.epoll=false -jar $JAR nogui
-  if [ $? -eq 0 ]; then
-    break
-  fi
-done

testing/install_script.sh

@@ -8,16 +8,11 @@ EULA_MARKER=$MC_DIR/.eula_accepted
 
 VERSION_CHECK=$(curl -s "https://piston-meta.mojang.com/mc/game/version_manifest_v2.json" | grep -Pom 1 '"url": "\K[^"]*'$MC_VERSION'.json')
 MC_SERVER_FILE=$(curl -s $VERSION_CHECK | jq --raw-output '.downloads.server.url')
-
+BUKKIT_INSTALLER_FILE=https://cdn.getbukkit.org/craftbukkit/craftbukkit-$MC_VERSION.jar
-MC_VANILLA_RUN_FILE=https://gitea.fithwum.tech/fithwum/minecraft/raw/branch/master/vanilla/run.sh
 FORGE_INSTALLER_FILE=https://maven.minecraftforge.net/net/minecraftforge/forge/$MC_VERSION-$FORGE_VERSION/forge-$MC_VERSION-$FORGE_VERSION-installer.jar
 NEOFORGED_INSTALLER_FILE=https://maven.neoforged.net/releases/net/neoforged/neoforge/$NEOFORGED_VERSION/neoforge-$NEOFORGED_VERSION-installer.jar
 FABRIC_SERVER_FILE=https://meta.fabricmc.net/v2/versions/loader/$MC_VERSION/$FABRIC_VERSION/$FABRIC_INSTALLER_VERSION/server/jar
-MC_FABRIC_RUN_FILE=https://gitea.fithwum.tech/fithwum/minecraft/raw/branch/master/fabric/run.sh
 QUILT_INSTALLER_FILE=https://quiltmc.org/api/v1/download-latest-installer/java-universal
-MC_QUILT_RUN_FILE=https://gitea.fithwum.tech/fithwum/minecraft/raw/branch/master/quilt/run.sh
-BUKKIT_INSTALLER_FILE=https://cdn.getbukkit.org/craftbukkit/craftbukkit-$MC_VERSION.jar
-MC_BUKKIT_RUN_FILE=https://gitea.fithwum.tech/fithwum/minecraft/raw/branch/master/bukkit/run.sh
 
 # Install java
 if dpkg -s openjdk-$JAVA_VERSION-jre-headless &> /dev/null
@@ -74,7 +69,21 @@ if [ $MC_TYPE = "vanilla" ]; then
 			echo " "
 			echo "WARNING ! run-$MC_TYPE-$MC_VERSION.sh is out of date/missing ... will download now."
 			mv -v $MC_DIR/run-*.sh $MC_DIR/old-server-versions
-			wget --no-cache --show-progress --progress=bar:force:noscroll $MC_VANILLA_RUN_FILE -O $MC_DIR/run-$MC_TYPE-$MC_VERSION.sh
+			tee $MC_DIR/run-$MC_TYPE-$MC_VERSION.sh <<-EOF
+			#!/bin/bash
+			# Copyright (c) 2022 fithwum
+			# All rights reserved
+
+			cd /MCserver
+			JAR=./MCserver-*.jar
+
+			while [ true ]; do
+				java -Xmx$XMX_SIZE -Xms$XMS_SIZE -Xmn$XMN_SIZE -Dbungee.epoll=false -jar $JAR nogui
+				if [ $? -eq 0 ]; then
+					break
+				fi
+			done
+			EOF
 			chmod +x $MC_DIR/run-$MC_TYPE-$MC_VERSION.sh
 	fi
 
@@ -96,17 +105,23 @@ elif [ $MC_TYPE = "bukkit" ]; then
 			rm -fr $MC_DIR/libraries
 			wget --no-cache --show-progress --progress=bar:force:noscroll $BUKKIT_INSTALLER_FILE -O $MC_DIR/craftbukkit-$MC_VERSION.jar
 			chmod +x $MC_DIR/craftbukkit-$MC_VERSION.jar
-	fi
-	# Looking for run-$MC_TYPE-$MC_VERSION.sh
-	if [ -e $MC_DIR/run-$MC_TYPE-$MC_VERSION.sh ]
-		then
-			echo " "
-			echo "INFO ! run-$MC_TYPE-$MC_VERSION.sh found ... will use existing file."
-		else
 			echo " "
 			echo "WARNING ! run-$MC_TYPE-$MC_VERSION.sh is out of date/missing ... will download now."
-			mv -v $MC_DIR/run-*.sh $MC_DIR/old-server-versions
+			tee $MC_DIR/run-$MC_TYPE-$MC_VERSION.sh <<-EOF
-			wget --no-cache --show-progress --progress=bar:force:noscroll $MC_BUKKIT_RUN_FILE -O $MC_DIR/run-$MC_TYPE-$MC_VERSION.sh
+			#!/bin/bash
+			# Copyright (c) 2022 fithwum
+			# All rights reserved
+
+			cd /MCserver
+			JAR=./craftbukkit-*.jar
+
+			while [ true ]; do
+				java -Xmx$XMX_SIZE -Xms$XMS_SIZE -Xmn$XMN_SIZE -Dbungee.epoll=false -jar $JAR nogui
+				if [ $? -eq 0 ]; then
+					break
+				fi
+			done
+			EOF
 			chmod +x $MC_DIR/run-$MC_TYPE-$MC_VERSION.sh
 	fi
 
@@ -128,17 +143,23 @@ elif [ $MC_TYPE = "fabric" ]; then
 			rm -fr $MC_DIR/libraries
 			wget --no-cache --show-progress --progress=bar:force:noscroll $FABRIC_SERVER_FILE -O $MC_DIR/fabric-$MC_VERSION-$FABRIC_VERSION.jar
 			chmod +x $MC_DIR/fabric-$MC_VERSION-$FABRIC_VERSION.jar
-	fi
-	# Looking for run-$MC_TYPE-$MC_VERSION.sh
-	if [ -e $MC_DIR/run-$MC_TYPE-$MC_VERSION.sh ]
-		then
-			echo " "
-			echo "INFO ! run-$MC_TYPE-$MC_VERSION.sh found ... will use existing file."
-		else
 			echo " "
 			echo "WARNING ! run-$MC_TYPE-$MC_VERSION.sh is out of date/missing ... will download now."
-			mv -v $MC_DIR/run-*.sh $MC_DIR/old-server-versions
+			tee $MC_DIR/run-$MC_TYPE-$MC_VERSION.sh <<-EOF
-			wget --no-cache --show-progress --progress=bar:force:noscroll $MC_FABRIC_RUN_FILE -O $MC_DIR/run-$MC_TYPE-$MC_VERSION.sh
+			#!/bin/bash
+			# Copyright (c) 2022 fithwum
+			# All rights reserved
+
+			cd /MCserver
+			JAR=./fabric-*-*.jar
+
+			while [ true ]; do
+				java -Xmx$XMX_SIZE -Xms$XMS_SIZE -Xmn$XMN_SIZE -Dbungee.epoll=false -jar $JAR nogui
+				if [ $? -eq 0 ]; then
+					break
+				fi
+			done
+			EOF
 			chmod +x $MC_DIR/run-$MC_TYPE-$MC_VERSION.sh
 	fi
 
@@ -165,19 +186,25 @@ elif [ $MC_TYPE = "quilt" ]; then
 			mv -v * $MC_DIR
 			cd ..
 			rm -fr server
-			cd ..
-	fi
-	# Looking for run-$MC_TYPE-$MC_VERSION.sh
-	if [ -e $MC_DIR/run-$MC_TYPE-$MC_VERSION.sh ]
-		then
-			echo " "
-			echo "INFO ! run-$MC_TYPE-$MC_VERSION.sh found ... will use existing file."
-		else
 			echo " "
 			echo "WARNING ! run-$MC_TYPE-$MC_VERSION.sh is out of date/missing ... will download now."
-			mv -v $MC_DIR/run-*.sh $MC_DIR/old-server-versions
+			tee $MC_DIR/run-$MC_TYPE-$MC_VERSION.sh <<-EOF
-			wget --no-cache --show-progress --progress=bar:force:noscroll $MC_QUILT_RUN_FILE -O $MC_DIR/run-$MC_TYPE-$MC_VERSION.sh
+			#!/bin/bash
+			# Copyright (c) 2022 fithwum
+			# All rights reserved
+
+			cd /MCserver
+			JAR=./quilt-server-launch.jar
+
+			while [ true ]; do
+				java -Xmx$XMX_SIZE -Xms$XMS_SIZE -Xmn$XMN_SIZE -Dbungee.epoll=false -jar $JAR nogui
+				if [ $? -eq 0 ]; then
+					break
+				fi
+			done
+			EOF
 			chmod +x $MC_DIR/run-$MC_TYPE-$MC_VERSION.sh
+			cd ..
 	fi
 
 # NOT WORKING

testing/run.sh

@@ -5,23 +5,16 @@
 cd /MCserver
 JAR=./MCserver-*.jar
 
-# # Check if a screen session is already running
+# Check if a screen session is already running
-# if screen -list | grep -q "MCserver"; then
+if screen -list | grep -q "mcserver"; then
-#   echo "INFO ! A screen session for the Minecraft server is already running."
+  echo "INFO ! A screen session for the Minecraft server is already running."
-# else
+else
-#   # Start the Minecraft server in a detached screen session
+  # Start the Minecraft server in a detached screen session
-#   echo "INFO ! Starting Minecraft Server in a screen session."
+  echo "INFO ! Starting Minecraft Server in a screen session."
-#   screen -mS mcserver bash -c 'while true; do
+  screen -mS mcserver bash -c 'while true; do
-#     java -Xmx$XMX_SIZE -Xms$XMS_SIZE -Xmn$XMN_SIZE -jar $JAR nogui
-#     if [ $? -eq 0 ]; then
-#       break
-#     fi
-#   done'
-# fi
-
-while [ true ]; do
     java -Xmx$XMX_SIZE -Xms$XMS_SIZE -Xmn$XMN_SIZE -jar $JAR nogui
     if [ $? -eq 0 ]; then
       break
     fi
-done
+  done'
+fi

vanilla/install_script.sh

@@ -8,7 +8,6 @@ EULA_MARKER=$MC_DIR/.eula_accepted
 
 VERSION_CHECK=$(curl -s "https://piston-meta.mojang.com/mc/game/version_manifest_v2.json" | grep -Pom 1 '"url": "\K[^"]*'$MC_VERSION'.json')
 MC_SERVER_FILE=$(curl -s $VERSION_CHECK | jq --raw-output '.downloads.server.url')
-MC_RUN_FILE=https://gitea.fithwum.tech/fithwum/minecraft/raw/branch/master/vanilla/run.sh
 
 # Install java
 if dpkg -s openjdk-$JAVA_VERSION-jre-headless &> /dev/null
@@ -59,7 +58,21 @@ if [ -e $MC_DIR/run-$MC_VERSION.sh ]
 		echo " "
 		echo "WARNING ! run.sh is out of date/missing ... will download now."
 		mv $MC_DIR/run-*.sh $MC_DIR/old-server-versions/
-		wget --no-cache --show-progress --progress=bar:force:noscroll $MC_RUN_FILE -O $MC_DIR/run-$MC_VERSION.sh
+		tee $MC_DIR/run-$MC_VERSION.sh <<-EOF
+		#!/bin/bash
+		# Copyright (c) 2022 fithwum
+		# All rights reserved
+
+		cd /MCserver
+		JAR=./MCserver-*.jar
+
+		while [ true ]; do
+			java -Xmx$XMX_SIZE -Xms$XMS_SIZE -Xmn$XMN_SIZE -Dbungee.epoll=false -jar $JAR nogui
+			if [ $? -eq 0 ]; then
+				break
+			fi
+		done
+		EOF
 		chmod +x $MC_DIR/run-$MC_VERSION.sh
 fi
 

vanilla/run.sh

@@ -1,13 +0,0 @@
-#!/bin/bash
-# Copyright (c) 2022 fithwum
-# All rights reserved
-
-cd /MCserver
-JAR=./MCserver-*.jar
-
-while [ true ]; do
-  java -Xmx$XMX_SIZE -Xms$XMS_SIZE -Xmn$XMN_SIZE -jar $JAR nogui
-  if [ $? -eq 0 ]; then
-    break
-  fi
-done