diff --git a/vanilla/install_script.sh b/vanilla/install_script.sh index 25482af..b73ede2 100644 --- a/vanilla/install_script.sh +++ b/vanilla/install_script.sh @@ -11,32 +11,32 @@ MC_RUN_FILE=https://gitlab.fithwum.tech/fithwum/minecraft/-/raw/master/vanilla/r # Main install (Debian). # Check for files in /MCserver and download if needed. -if [ -e /MCserver/MCserver_$MC_VERSION.jar ] +if [ -e /MCserver/MCserver-$MC_VERSION.jar ] then echo " " - echo "INFO ! MCserver_$MC_VERSION.jar found starting now." + echo "INFO ! MCserver-$MC_VERSION.jar found starting now." else echo " " - echo "WARNING ! MCserver_$MC_VERSION.jar is out of date/missing ... will download now." + echo "WARNING ! MCserver-$MC_VERSION.jar is out of date/missing ... will download now." echo " " echo "INFO ! Cleaning old files." mkdir /MCserver/old-server-versions/ - mv /MCserver/MCserver_*.jar /MCserver/old-server-versions/ - mv /MCserver/run_*.sh /MCserver/old-server-versions/ - wget --no-cache $MC_SERVER_FILE -O /MCserver/MCserver_$MC_VERSION.jar + mv /MCserver/MCserver-*.jar /MCserver/old-server-versions/ + mv /MCserver/run-*.sh /MCserver/old-server-versions/ + wget --no-cache $MC_SERVER_FILE -O /MCserver/MCserver-$MC_VERSION.jar fi -sleep 1 +sleep 666 -# Looking for run_${MC_VERSION}.sh -if [ -e /MCserver/run_$MC_VERSION.sh ] +# Looking for run-${MC_VERSION}.sh +if [ -e /MCserver/run-$MC_VERSION.sh ] then echo " " - echo "INFO ! run_$MC_VERSION.sh found ... will use existing file." + 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." - wget --no-cache $MC_RUN_FILE -O /MCserver/run_$MC_VERSION.sh + wget --no-cache $MC_RUN_FILE -O /MCserver/run-$MC_VERSION.sh fi sleep 1 @@ -69,7 +69,7 @@ if [ "$ACCEPT_EULA" == "true" ]; then echo " " echo "INFO ! EULA accepted, server restarting, please wait..." sleep 1 - exec /MCserver/run_$MC_VERSION.sh --dataPath=/MCserver + exec /MCserver/run-$MC_VERSION.sh --dataPath=/MCserver exit 0 fi elif [ "$ACCEPT_EULA" == "false" ]; then @@ -87,14 +87,14 @@ sleep 1 # Set permissions. chown 99:100 -R /MCserver chmod 777 -R /MCserver -chmod +x /MCserver/run_$MC_VERSION.sh -chmod +x /MCserver/MCserver_$MC_VERSION.jar +chmod +x /MCserver/run-$MC_VERSION.sh +chmod +x /MCserver/MCserver-$MC_VERSION.jar sleep 1 # Run Minecraft server. echo " " echo "INFO ! Starting Minecraft Server $MC_VERSION" -exec /MCserver/run_$MC_VERSION.sh --dataPath=/MCserver +exec /MCserver/run-$MC_VERSION.sh --dataPath=/MCserver exit \ No newline at end of file