From bca6dd8673dcc9fed7f0dc15a2f6b75dac41becb Mon Sep 17 00:00:00 2001 From: JeremyStarTM Date: Sat, 27 Jan 2024 16:32:41 +0100 Subject: [PATCH] Rename example conf, change Makefile & entrypoint --- Makefile | 8 ++++---- config.example => config.example.env | 0 entrypoint.sh | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) rename config.example => config.example.env (100%) diff --git a/Makefile b/Makefile index 3afcb68..b3fa323 100644 --- a/Makefile +++ b/Makefile @@ -3,12 +3,12 @@ dist: help help: @echo "make help [Displays help]" + @echo " check [Check all shell scripts for issues]" @echo " build [Builds the docker image]" - @echo " test [Tests the docker image]" @echo " clean [Cleans the docker build cache]" -build: +check: + shellcheck *.sh +build: check docker buildx build --progress tty --tag mcserverdocker:repobuild . clean: docker buildx prune --all --force -test: - docker run mcserverdocker:repobuild diff --git a/config.example b/config.example.env similarity index 100% rename from config.example rename to config.example.env diff --git a/entrypoint.sh b/entrypoint.sh index e7074e0..efe2216 100755 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -60,7 +60,7 @@ function kill_server() { function run() { echo ":: Starting server" - cd /data + cd /data||exit 69 # We want to use ${ARGS} without using parenthesis # shellcheck disable=SC2086 "/usr/lib/jvm/java-${MCSD_JAVA_VERSION}-openjdk/bin/java" -jar "/data/server.jar" ${ARGS} &