diff --git a/testing/install_script.sh b/testing/install_script.sh index f253329..7c0590b 100644 --- a/testing/install_script.sh +++ b/testing/install_script.sh @@ -52,18 +52,17 @@ if [ $MC_TYPE = "vanilla" ]; then echo "WARNING ! MCserver-$MC_VERSION.jar is out of date/missing ... will download now." echo " " echo "INFO ! Cleaning old files." - mkdir -pv $MC_DIR/old-server-versions - rm -fr $MC_DIR/*.jar - mv -v $MC_DIR/*.log $MC_DIR/old-server-versions - mv -v $MC_DIR/run-*.sh /old-server-versions - 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 + cd $MC_DIR + mkdir -pv old-server-versions + rm -fr *.jar + mv -v *.log /old-server-versions + rm -fr libraries + wget --no-cache --show-progress --progress=bar:force:noscroll $MC_SERVER_FILE -O MCserver-$MC_VERSION.jar + chmod +x MCserver-$MC_VERSION.jar 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" + mv -v run-*.sh /old-server-versions + cat > run-$MC_TYPE-$MC_VERSION.sh <<- "EOF" #!/bin/bash # Copyright (c) 2022 fithwum # All rights reserved @@ -78,25 +77,9 @@ 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 + chmod +x run-$MC_TYPE-$MC_VERSION.sh + cd .. fi - elif [ $MC_TYPE = "bukkit" ]; then echo "INFO ! Bukkit Selected" if [ -e $MC_DIR/craftbukkit-$MC_VERSION.jar ] @@ -108,17 +91,17 @@ elif [ $MC_TYPE = "bukkit" ]; then echo "WARNING ! craftbukkit-$MC_VERSION.jar is out of date/missing ... will download now." echo " " echo "INFO ! Cleaning old files." - mkdir -pv $MC_DIR/old-server-versions - rm -fr $MC_DIR/*.jar - mv -v $MC_DIR/*.log $MC_DIR/old-server-versions - mv -v $MC_DIR/run-*.sh /old-server-versions - 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 + cd $MC_DIR + mkdir -pv old-server-versions + rm -fr *.jar + mv -v *.log /old-server-versions + rm -fr libraries + wget --no-cache --show-progress --progress=bar:force:noscroll $BUKKIT_INSTALLER_FILE -O craftbukkit-$MC_VERSION.jar + chmod +x craftbukkit-$MC_VERSION.jar echo " " echo "WARNING ! run-$MC_TYPE-$MC_VERSION.sh is out of date/missing ... will generate now." - - cat > $MC_DIR/run-$MC_TYPE-$MC_VERSION.sh <<- "EOF" + mv -v run-*.sh /old-server-versions + cat > run-$MC_TYPE-$MC_VERSION.sh <<- "EOF" #!/bin/bash # Copyright (c) 2022 fithwum # All rights reserved @@ -133,25 +116,9 @@ 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 + chmod +x run-$MC_TYPE-$MC_VERSION.sh + cd .. fi - elif [ $MC_TYPE = "fabric" ]; then echo "INFO ! Fabric Selected" if [ -e $MC_DIR/fabric-$MC_VERSION-$FABRIC_VERSION.jar ] @@ -163,17 +130,17 @@ elif [ $MC_TYPE = "fabric" ]; then echo "WARNING ! fabric-$MC_VERSION-$FABRIC_VERSION.jar is out of date/missing ... will download now." echo " " echo "INFO ! Cleaning old files." - mkdir -pv $MC_DIR/old-server-versions - rm -fr $MC_DIR/*.jar - mv -v $MC_DIR/*.log $MC_DIR/old-server-versions - mv -v $MC_DIR/run-*.sh /old-server-versions - 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 + cd $MC_DIR + mkdir -pv old-server-versions + rm -fr *.jar + mv -v *.log /old-server-versions + rm -fr libraries + wget --no-cache --show-progress --progress=bar:force:noscroll $FABRIC_SERVER_FILE -O fabric-$MC_VERSION-$FABRIC_VERSION.jar + chmod +x fabric-$MC_VERSION-$FABRIC_VERSION.jar echo " " echo "WARNING ! run-$MC_TYPE-$MC_VERSION.sh is out of date/missing ... will generate now." - - cat > $MC_DIR/run-$MC_TYPE-$MC_VERSION.sh <<- "EOF" + mv -v run-*.sh /old-server-versions + cat > run-$MC_TYPE-$MC_VERSION.sh <<- "EOF" #!/bin/bash # Copyright (c) 2022 fithwum # All rights reserved @@ -188,26 +155,9 @@ 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 + chmod +x run-$MC_TYPE-$MC_VERSION.sh + cd .. fi - elif [ $MC_TYPE = "quilt" ]; then echo "INFO ! Quilt Selected" if [ -e $MC_DIR/quilt-installer-$QUILT_VERSION.jar ] @@ -233,8 +183,8 @@ 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." - - cat > $MC_DIR/run-$MC_TYPE-$MC_VERSION.sh <<- "EOF" + mv -v run-*.sh /old-server-versions + cat > run-$MC_TYPE-$MC_VERSION.sh <<- "EOF" #!/bin/bash # Copyright (c) 2022 fithwum # All rights reserved @@ -249,24 +199,7 @@ 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 + chmod +x run-$MC_TYPE-$MC_VERSION.sh cd .. fi @@ -293,14 +226,18 @@ elif [ $MC_TYPE = "forge" ]; then java -jar forge-$MC_VERSION-$FORGE_VERSION-installer.jar --installServer mv -v run.sh run-$MC_TYPE-$MC_VERSION.sh chmod +x run-$MC_TYPE-$MC_VERSION.sh - tee user_jvm_args.txt <<-EOF + cat > user_jvm_args.txt <<- "EOF" -Xmx${XMX_SIZE} -Xms${XMS_SIZE} -Xmn${XMN_SIZE} EOF + # tee user_jvm_args.txt <<-EOF + # -Xmx${XMX_SIZE} + # -Xms${XMS_SIZE} + # -Xmn${XMN_SIZE} + # EOF cd .. fi - elif [ $MC_TYPE = "neoforged" ]; then echo "INFO ! Neoforged Selected" if [ -e $MC_DIR/neoforge-$NEOFORGED_VERSION-installer.jar ] @@ -323,14 +260,18 @@ elif [ $MC_TYPE = "neoforged" ]; then java -jar neoforge-$NEOFORGED_VERSION-installer.jar --installServer mv -v run.sh run-$MC_TYPE-$MC_VERSION.sh chmod +x run-$MC_TYPE-$MC_VERSION.sh - tee user_jvm_args.txt <<-EOF + cat > user_jvm_args.txt <<- "EOF" -Xmx${XMX_SIZE} -Xms${XMS_SIZE} -Xmn${XMN_SIZE} EOF + # tee user_jvm_args.txt <<-EOF + # -Xmx${XMX_SIZE} + # -Xms${XMS_SIZE} + # -Xmn${XMN_SIZE} + # EOF cd .. fi - else echo "ERROR ! MC_TYPE must be set first run" sleep infinity @@ -370,7 +311,7 @@ fi # Set permissions. chown 99:100 -R $MC_DIR -chmod 777 -R $MC_DIR +chmod 776 -R $MC_DIR sleep 1