updates

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
@@ -48,19 +47,25 @@ if [ -e $MC_DIR/MCserver-$MC_VERSION.jar ]
 		mv $MC_DIR/MCserver-*.jar $MC_DIR/old-server-versions/
 		wget --no-cache --show-progress --progress=bar:force:noscroll $MC_SERVER_FILE -O $MC_DIR/MCserver-$MC_VERSION.jar
 		chmod +x $MC_DIR/MCserver-$MC_VERSION.jar
-fi
+		echo " "
+		echo "WARNING ! run-$MC_TYPE-$MC_VERSION.sh is out of date/missing ... will generate now."
+		mv -v $MC_DIR/run-*.sh $MC_DIR/old-server-versions/
+		cat > $MC_DIR/run-$MC_TYPE-$MC_VERSION.sh <<- "EOF"
+		#!/bin/bash
+		# Copyright (c) 2022 fithwum
+		# All rights reserved
 
-# Looking for run-${MC_VERSION}.sh
-if [ -e $MC_DIR/run-$MC_VERSION.sh ]
-	then
-		echo " "
-		echo "INFO ! run-$MC_VERSION.sh found ... will use existing file."
-	else
-		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
-		chmod +x $MC_DIR/run-$MC_VERSION.sh
+		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
 
 echo "INFO ! Setting game port."