From 2c65ecae8bcc36688c075db4d03ff8f92dd73486 Mon Sep 17 00:00:00 2001 From: Pierre-Jean Lefort Date: Fri, 19 Aug 2022 13:42:17 +0200 Subject: [PATCH 1/2] using the file created by the linuxgsm.sh --- entrypoint.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/entrypoint.sh b/entrypoint.sh index edf7c52..87ad257 100644 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -36,7 +36,11 @@ fi # Setup game server if [ ! -f "${GAMESERVER}" ]; then echo "creating ./${GAMESERVER}" - ./linuxgsm.sh ${GAMESERVER} + exec_name=$(./linuxgsm.sh ${GAMESERVER} | grep -o ${GAMESERVER}-. | head -1) + if [ -z "$exec_name" ]; then + exec_name=${GAMESERVER} + fi + export GAMESERVER=$exec_name fi # Install game server From b5c99bdf4a01f6ba49c23d1453864b87f78c30bb Mon Sep 17 00:00:00 2001 From: Pierre-Jean Lefort Date: Fri, 19 Aug 2022 13:54:51 +0200 Subject: [PATCH 2/2] little refactor --- entrypoint.sh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/entrypoint.sh b/entrypoint.sh index 87ad257..adb584f 100644 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -37,10 +37,9 @@ fi if [ ! -f "${GAMESERVER}" ]; then echo "creating ./${GAMESERVER}" exec_name=$(./linuxgsm.sh ${GAMESERVER} | grep -o ${GAMESERVER}-. | head -1) - if [ -z "$exec_name" ]; then - exec_name=${GAMESERVER} + if [ ! -z "$exec_name" ]; then + export GAMESERVER=$exec_name fi - export GAMESERVER=$exec_name fi # Install game server