diff --git a/bukkit/install_script.sh b/bukkit/install_script.sh index 9832e60..c0c35be 100644 --- a/bukkit/install_script.sh +++ b/bukkit/install_script.sh @@ -47,25 +47,17 @@ 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 "INFO ! run-$MC_VERSION.sh found ... will use existing file." - else - echo " " - echo "WARNING ! run.sh is out of date/missing ... will download now." + echo "WARNING ! run.sh is out of date/missing ... will generate 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 diff --git a/fabric/install_script.sh b/fabric/install_script.sh index 3d90b7e..8cf0e93 100644 --- a/fabric/install_script.sh +++ b/fabric/install_script.sh @@ -47,25 +47,17 @@ 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 "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 generate 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 diff --git a/quilt/Install_Script.sh b/quilt/Install_Script.sh index 1e84bf7..44e45b1 100644 --- a/quilt/Install_Script.sh +++ b/quilt/Install_Script.sh @@ -55,27 +55,18 @@ 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 "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 generate 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 @@ -84,6 +75,7 @@ if [ -e $MC_DIR/run-$MC_VERSION.sh ] done EOF chmod +x $MC_DIR/run-$MC_VERSION-$QUILT_VERSION.sh + cd .. fi echo "INFO ! Setting game port." diff --git a/testing/install_script.sh b/testing/install_script.sh index 724eb5d..3836ab2 100644 --- a/testing/install_script.sh +++ b/testing/install_script.sh @@ -59,24 +59,17 @@ if [ $MC_TYPE = "vanilla" ]; then rm -fr $MC_DIR/libraries 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_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." + 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 #!/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 @@ -106,15 +99,15 @@ elif [ $MC_TYPE = "bukkit" ]; then 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 echo " " - echo "WARNING ! run-$MC_TYPE-$MC_VERSION.sh is out of date/missing ... will download now." + 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 #!/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 @@ -144,15 +137,15 @@ elif [ $MC_TYPE = "fabric" ]; then 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 echo " " - echo "WARNING ! run-$MC_TYPE-$MC_VERSION.sh is out of date/missing ... will download now." + 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 #!/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 @@ -187,15 +180,15 @@ elif [ $MC_TYPE = "quilt" ]; then cd .. rm -fr server echo " " - echo "WARNING ! run-$MC_TYPE-$MC_VERSION.sh is out of date/missing ... will download now." + 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 #!/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 diff --git a/vanilla/install_script.sh b/vanilla/install_script.sh index e4ef063..f042fdb 100644 --- a/vanilla/install_script.sh +++ b/vanilla/install_script.sh @@ -47,25 +47,17 @@ 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 "INFO ! run-$MC_VERSION.sh found ... will use existing file." - else - echo " " - echo "WARNING ! run.sh is out of date/missing ... will download now." + echo "WARNING ! run.sh is out of date/missing ... will generate 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