From 96b4e576a8088450dde25e7cb73adac244b3846a Mon Sep 17 00:00:00 2001
From: Daniel Gibbs <me@danielgibbs.co.uk>
Date: Sat, 22 Oct 2022 22:14:26 +0100
Subject: [PATCH] tweakes

---
 Dockerfile    | 4 +---
 entrypoint.sh | 7 ++++---
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index c7d2f90..a749256 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -12,7 +12,7 @@ ENV DEBIAN_FRONTEND noninteractive
 ENV TERM=xterm
 ENV LGSM_GITHUBUSER=GameServerManagers
 ENV LGSM_GITHUBREPO=LinuxGSM
-ENV LGSM_GITHUBBRANCH=develop
+ENV LGSM_GITHUBBRANCH=master
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 
 ## Install Base LinuxGSM Requirements
@@ -108,5 +108,3 @@ RUN (crontab -l 2>/dev/null; echo "*/30 * * * * /linuxgsm/*server update > /dev/
 RUN rm -f /linuxgsm/entrypoint.sh
 COPY entrypoint.sh /linuxgsm/entrypoint.sh
 RUN date > /time.txt
-ENTRYPOINT [ "/usr/bin/tini", "--" ]
-CMD [ "bash","./entrypoint.sh" ]
diff --git a/entrypoint.sh b/entrypoint.sh
index d820868..0721bbd 100755
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -1,10 +1,9 @@
 #!/bin/bash
 
 exit_handler() {
-  # Execute the  shutdown commands
+  # Execute the shutdown commands
   echo "recieved SIGTERM stopping ${GAMESERVER}"
   ./${GAMESERVER} stop
-  exit 0
 }
 
 # Exit trap
@@ -12,7 +11,7 @@ echo "loading exit trap"
 trap exit_handler SIGTERM
 
 echo -e ""
-echo -e "Welcome to the DockerGSM"
+echo -e "Welcome to the LinuxGSM"
 echo -e "================================================================================"
 echo -e "TIME: $(date)"
 echo -e "SCRIPT TIME: $(cat /time.txt)"
@@ -38,6 +37,7 @@ cd /linuxgsm || exit
 
 # Setup game server
 if [ ! -f "${GAMESERVER}" ]; then
+  echo ""
   echo "creating ./${GAMESERVER}"
   ./linuxgsm.sh ${GAMESERVER}
 fi
@@ -49,6 +49,7 @@ fi
 
 # Install game server
 if [ -z "$(ls -A -- "serverfiles")" ]; then
+  echo ""
   echo "installing ${GAMESERVER}"
   ./${GAMESERVER} auto-install
 fi