diff --git a/testing/test.sh b/testing/test.sh index c5af73e..d8150ff 100755 --- a/testing/test.sh +++ b/testing/test.sh @@ -5,8 +5,8 @@ MC_VERSION="1.14.4" VERSION_CHECK=$(curl -s "https://piston-meta.mojang.com/mc/game/version_manifest_v2.json" | grep -Pom 1 '"url": "\K[^"]*'$MC_VERSION'.json') -SERVER_FILE=$(curl -s $VERSION_CHECK | jq --raw-output '.downloads.server.url') +MC_SERVER_FILE=$(curl -s $VERSION_CHECK | jq --raw-output '.downloads.server.url') -echo "Server url: $SERVER_FILE" +echo "Server url: $MC_SERVER_FILE" -wget --no-cache ${SERVER_FILE} -O /mnt/Other/Dockers/minecraft/testing/server-${MC_VERSION}.jar \ No newline at end of file +wget --no-cache ${MC_SERVER_FILE} -O /mnt/Other/Dockers/minecraft/testing/server-${MC_VERSION}.jar \ No newline at end of file diff --git a/vanilla/install_script.sh b/vanilla/install_script.sh index 54c1005..0014ba3 100644 --- a/vanilla/install_script.sh +++ b/vanilla/install_script.sh @@ -14,10 +14,10 @@ MC_RUN_FILE=https://gitlab.fithwum.tech/fithwum/minecraft/-/raw/master/vanilla/r 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/ @@ -45,7 +45,7 @@ sleep 1 if [ ! -f /MCserver/eula.txt ]; then : else - if [ "${ACCEPT_EULA}" == "false" ]; then + if [ "$ACCEPT_EULA" == "false" ]; then if grep -rq 'eula=true' /MCserver/eula.txt; then sed -i '/eula=true/c\eula=false' /MCserver/eula.txt fi @@ -63,7 +63,7 @@ if [ ! -f /MCserver/eula.txt ]; then echo "WARNING ! EULA not found please stand by..." sleep 5 fi -if [ "${ACCEPT_EULA}" == "true" ]; then +if [ "$ACCEPT_EULA" == "true" ]; then if grep -rq 'eula=false' /MCserver/eula.txt; then sed -i '/eula=false/c\eula=true' /MCserver/eula.txt echo " " @@ -72,7 +72,7 @@ if [ "${ACCEPT_EULA}" == "true" ]; then exec /MCserver/run_${MC_VERSION}.sh --dataPath=/MCserver exit 0 fi -elif [ "${ACCEPT_EULA}" == "false" ]; then +elif [ "$ACCEPT_EULA" == "false" ]; then echo " " echo "WARNING ! EULA not accepted, you must accept the EULA" echo " to start the Server, putting server in sleep mode" @@ -94,7 +94,7 @@ sleep 1 # Run Minecraft server. echo " " -echo "INFO ! Starting Minecraft Server ${MC_VERSION}" +echo "INFO ! Starting Minecraft Server $MC_VERSION" exec /MCserver/run_${MC_VERSION}.sh --dataPath=/MCserver exit \ No newline at end of file