From 133cd58c546a45ccaedfe770380c9bc0826b375e Mon Sep 17 00:00:00 2001 From: fithwum Date: Fri, 17 Jul 2026 08:31:10 -0700 Subject: [PATCH] added run files back until i can fix the problem with autogen --- bukkit/install_script.sh | 27 +++++------ bukkit/run.sh | 13 ++++++ fabric/install_script.sh | 27 +++++------ fabric/run.sh | 13 ++++++ quilt/Install_Script.sh | 28 +++++------- quilt/run.sh | 13 ++++++ testing/install_script.sh | 94 ++++++++++++++++++++++++++++++++++----- vanilla/install_script.sh | 27 +++++------ vanilla/run.sh | 13 ++++++ 9 files changed, 178 insertions(+), 77 deletions(-) create mode 100644 bukkit/run.sh create mode 100644 fabric/run.sh create mode 100644 quilt/run.sh create mode 100644 vanilla/run.sh diff --git a/bukkit/install_script.sh b/bukkit/install_script.sh index c0c35be..18ab505 100644 --- a/bukkit/install_script.sh +++ b/bukkit/install_script.sh @@ -8,6 +8,7 @@ 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 @@ -47,24 +48,18 @@ if [ -e $MC_DIR/craftbukkit-$MC_VERSION.jar ] mv $MC_DIR/craftbukkit-*.sh $MC_DIR/old-server-versions/ wget --no-cache --show-progress --progress=bar:force:noscroll $INSTALLER_FILE -O $MC_DIR/craftbukkit-$MC_VERSION.jar chmod +x $MC_DIR/craftbukkit-$MC_VERSION.jar +fi + +# Looking for run-${MC_VERSION}.sh +if [ -e $MC_DIR/run-$MC_VERSION.sh ] + then echo " " - echo "WARNING ! run.sh is out of date/missing ... will generate now." + 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/ - 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 + 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 fi diff --git a/bukkit/run.sh b/bukkit/run.sh new file mode 100644 index 0000000..a30b555 --- /dev/null +++ b/bukkit/run.sh @@ -0,0 +1,13 @@ +#!/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 \ No newline at end of file diff --git a/fabric/install_script.sh b/fabric/install_script.sh index 8cf0e93..4a045a6 100644 --- a/fabric/install_script.sh +++ b/fabric/install_script.sh @@ -8,6 +8,7 @@ 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 @@ -47,24 +48,18 @@ if [ -e $MC_DIR/fabric-$MC_VERSION-$FABRIC_VERSION.jar ] mv $MC_DIR/fabric-*-*.jar $MC_DIR/old-server-versions/ wget --no-cache --show-progress --progress=bar:force:noscroll $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.sh +if [ -e $MC_DIR/run-$MC_VERSION.sh ] + then echo " " - echo "WARNING ! run-$MC_VERSION.sh is out of date/missing ... will generate now." + 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." mv $MC_DIR/run-*.sh $MC_DIR/old-server-versions/ - 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 + 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 fi diff --git a/fabric/run.sh b/fabric/run.sh new file mode 100644 index 0000000..1d0fa6c --- /dev/null +++ b/fabric/run.sh @@ -0,0 +1,13 @@ +#!/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 \ No newline at end of file diff --git a/quilt/Install_Script.sh b/quilt/Install_Script.sh index 44e45b1..c844d58 100644 --- a/quilt/Install_Script.sh +++ b/quilt/Install_Script.sh @@ -8,6 +8,7 @@ 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 @@ -55,27 +56,20 @@ if [ -e $MC_DIR/quilt-installer-$QUILT_VERSION.jar ] mv * /$MC_DIR cd .. rm -fr server + cd .. +fi + +# Looking for run.sh +if [ -e $MC_DIR/run-$MC_VERSION.sh ] + then echo " " - echo "WARNING ! run-$MC_VERSION.sh is out of date/missing ... will generate now." + 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." 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 - cd .. fi echo "INFO ! Setting game port." diff --git a/quilt/run.sh b/quilt/run.sh new file mode 100644 index 0000000..032cd3b --- /dev/null +++ b/quilt/run.sh @@ -0,0 +1,13 @@ +#!/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 \ No newline at end of file diff --git a/testing/install_script.sh b/testing/install_script.sh index 3836ab2..f253329 100644 --- a/testing/install_script.sh +++ b/testing/install_script.sh @@ -62,14 +62,15 @@ if [ $MC_TYPE = "vanilla" ]; then 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 - tee $MC_DIR/run-$MC_TYPE-$MC_VERSION.sh <<-EOF + + cat > $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 @@ -77,6 +78,22 @@ if [ $MC_TYPE = "vanilla" ]; then fi done EOF + + # 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 @@ -100,14 +117,15 @@ elif [ $MC_TYPE = "bukkit" ]; then chmod +x $MC_DIR/craftbukkit-$MC_VERSION.jar echo " " echo "WARNING ! run-$MC_TYPE-$MC_VERSION.sh is out of date/missing ... will generate now." - tee $MC_DIR/run-$MC_TYPE-$MC_VERSION.sh <<-EOF + + cat > $MC_DIR/run-$MC_TYPE-$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 @@ -115,6 +133,22 @@ elif [ $MC_TYPE = "bukkit" ]; then fi done EOF + + # tee $MC_DIR/run-$MC_TYPE-$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_TYPE-$MC_VERSION.sh fi @@ -138,14 +172,15 @@ elif [ $MC_TYPE = "fabric" ]; then chmod +x $MC_DIR/fabric-$MC_VERSION-$FABRIC_VERSION.jar echo " " echo "WARNING ! run-$MC_TYPE-$MC_VERSION.sh is out of date/missing ... will generate now." - tee $MC_DIR/run-$MC_TYPE-$MC_VERSION.sh <<-EOF + + cat > $MC_DIR/run-$MC_TYPE-$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 @@ -153,6 +188,23 @@ elif [ $MC_TYPE = "fabric" ]; then fi done EOF + + # tee $MC_DIR/run-$MC_TYPE-$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_TYPE-$MC_VERSION.sh fi @@ -181,14 +233,15 @@ elif [ $MC_TYPE = "quilt" ]; then rm -fr server echo " " echo "WARNING ! run-$MC_TYPE-$MC_VERSION.sh is out of date/missing ... will generate now." - tee $MC_DIR/run-$MC_TYPE-$MC_VERSION.sh <<-EOF + + cat > $MC_DIR/run-$MC_TYPE-$MC_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 @@ -196,6 +249,23 @@ elif [ $MC_TYPE = "quilt" ]; then fi done EOF + + # tee $MC_DIR/run-$MC_TYPE-$MC_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_TYPE-$MC_VERSION.sh cd .. fi diff --git a/vanilla/install_script.sh b/vanilla/install_script.sh index f042fdb..6e1984a 100644 --- a/vanilla/install_script.sh +++ b/vanilla/install_script.sh @@ -8,6 +8,7 @@ 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 @@ -47,24 +48,18 @@ 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 + +# Looking for run-${MC_VERSION}.sh +if [ -e $MC_DIR/run-$MC_VERSION.sh ] + then echo " " - echo "WARNING ! run.sh is out of date/missing ... will generate now." + 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/ - 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 + 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 fi diff --git a/vanilla/run.sh b/vanilla/run.sh new file mode 100644 index 0000000..f294f43 --- /dev/null +++ b/vanilla/run.sh @@ -0,0 +1,13 @@ +#!/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 \ No newline at end of file