diff --git a/testing/install_script.sh b/testing/install_script.sh index 93cdc47..11118e2 100644 --- a/testing/install_script.sh +++ b/testing/install_script.sh @@ -60,17 +60,17 @@ if [ $MC_TYPE = "vanilla" ]; then 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 ] + # Looking for run-$MC_TYPE-$MC_VERSION.sh + if [ -e $MC_DIR/run-$MC_TYPE-$MC_VERSION.sh ] then echo " " - echo "INFO ! run-$MC_VERSION.sh found ... will use existing file." + echo "INFO ! run-$MC_TYPE-$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-$MC_TYPE-$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_VANILLA_RUN_FILE -O $MC_DIR/run-$MC_VERSION.sh - chmod +x $MC_DIR/run-$MC_VERSION.sh + wget --no-cache --show-progress --progress=bar:force:noscroll $MC_VANILLA_RUN_FILE -O $MC_DIR/run-$MC_TYPE-$MC_VERSION.sh + chmod +x $MC_DIR/run-$MC_TYPE-$MC_VERSION.sh fi elif [ $MC_TYPE = "forge" ]; then @@ -93,8 +93,8 @@ elif [ $MC_TYPE = "forge" ]; then wget --no-cache --show-progress --progress=bar:force:noscroll $FORGE_INSTALLER_FILE -O forge-$MC_VERSION-$FORGE_VERSION-installer.jar chmod +x forge-$MC_VERSION-$FORGE_VERSION-installer.jar java -jar forge-$MC_VERSION-$FORGE_VERSION-installer.jar --installServer - mv run.sh run-$MC_VERSION.sh - chmod +x run-$MC_VERSION.sh + mv run.sh run-$MC_TYPE-$MC_VERSION.sh + chmod +x run-$MC_TYPE-$MC_VERSION.sh cd .. fi @@ -118,8 +118,8 @@ elif [ $MC_TYPE = "neoforged" ]; then wget --no-cache --show-progress --progress=bar:force:noscroll $NEOFORGED_INSTALLER_FILE -O neoforge-$NEOFORGED_VERSION-installer.jar chmod +x neoforge-$NEOFORGED_VERSION-installer.jar java -jar neoforge-$NEOFORGED_VERSION-installer.jar --installServer - mv run.sh run-$MC_VERSION.sh - chmod +x run-$MC_VERSION.sh + mv run.sh run-$MC_TYPE-$MC_VERSION.sh + chmod +x run-$MC_TYPE-$MC_VERSION.sh cd .. fi @@ -139,17 +139,17 @@ 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 fi - # Looking for run.sh - if [ -e $MC_DIR/run-$MC_VERSION.sh ] + # Looking for run-$MC_TYPE-$MC_VERSION.sh + if [ -e $MC_DIR/run-$MC_TYPE-$MC_VERSION.sh ] then echo " " - echo "INFO ! run-$MC_VERSION.sh found ... will use existing file." + echo "INFO ! run-$MC_TYPE-$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_TYPE-$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_FABRIC_RUN_FILE -O $MC_DIR/run-$MC_VERSION.sh - chmod +x $MC_DIR/run-$MC_VERSION.sh + wget --no-cache --show-progress --progress=bar:force:noscroll $MC_FABRIC_RUN_FILE -O $MC_DIR/run-$MC_TYPE-$MC_VERSION.sh + chmod +x $MC_DIR/run-$MC_TYPE-$MC_VERSION.sh fi elif [ $MC_TYPE = "quilt" ]; then @@ -177,17 +177,17 @@ elif [ $MC_TYPE = "quilt" ]; then rm -fr server cd .. fi - # Looking for run.sh - if [ -e $MC_DIR/run-$MC_VERSION.sh ] + # Looking for run-$MC_TYPE-$MC_VERSION.sh + if [ -e $MC_DIR/run-$MC_TYPE-$MC_VERSION.sh ] then echo " " - echo "INFO ! run-$MC_VERSION.sh found ... will use existing file." + echo "INFO ! run-$MC_TYPE-$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_TYPE-$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_QUILT_RUN_FILE -O $MC_DIR/run-$MC_VERSION.sh - chmod +x $MC_DIR/run-$MC_VERSION.sh + wget --no-cache --show-progress --progress=bar:force:noscroll $MC_QUILT_RUN_FILE -O $MC_DIR/run-$MC_TYPE-$MC_VERSION.sh + chmod +x $MC_DIR/run-$MC_TYPE-$MC_VERSION.sh fi elif [ $MC_TYPE = "bukkit" ]; then @@ -206,17 +206,17 @@ 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 fi - # Looking for run-${MC_VERSION}.sh - if [ -e $MC_DIR/run-$MC_VERSION.sh ] + # Looking for run-$MC_TYPE-$MC_VERSION.sh + if [ -e $MC_DIR/run-$MC_TYPE-$MC_VERSION.sh ] then echo " " - echo "INFO ! run-$MC_VERSION.sh found ... will use existing file." + echo "INFO ! run-$MC_TYPE-$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-$MC_TYPE-$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_BUKKIT_RUN_FILE -O $MC_DIR/run-$MC_VERSION.sh - chmod +x $MC_DIR/run-$MC_VERSION.sh + wget --no-cache --show-progress --progress=bar:force:noscroll $MC_BUKKIT_RUN_FILE -O $MC_DIR/run-$MC_TYPE-$MC_VERSION.sh + chmod +x $MC_DIR/run-$MC_TYPE-$MC_VERSION.sh fi else @@ -265,6 +265,6 @@ sleep 1 # Run Minecraft server. echo " " echo "INFO ! Starting Minecraft Server $MC_VERSION" -exec $MC_DIR/run-$MC_VERSION.sh --dataPath=$MC_DIR +exec $MC_DIR/run-$MC_TYPE-$MC_VERSION.sh --dataPath=$MC_DIR exit \ No newline at end of file