From 6bdcf863a712613b595d7dc034fa83306086496b Mon Sep 17 00:00:00 2001 From: Drew Morrison <43414d@gmail.com> Date: Mon, 26 Feb 2024 23:37:05 -0600 Subject: [PATCH 1/6] update "EpicApp=Palserver" to "-publiclobby" per 1.5.0 changes --- scripts/start.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/start.sh b/scripts/start.sh index 4e014c90c..4c7c21afe 100644 --- a/scripts/start.sh +++ b/scripts/start.sh @@ -74,7 +74,7 @@ if [ -n "${QUERY_PORT}" ]; then fi if [ "${COMMUNITY,,}" = true ]; then - STARTCOMMAND+=("EpicApp=PalServer") + STARTCOMMAND+=("-publiclobby") fi if [ "${MULTITHREADING,,}" = true ]; then From cf9ae62aa8aa243c8608e8c3298338f9e6f35d51 Mon Sep 17 00:00:00 2001 From: Drew Morrison <43414d@gmail.com> Date: Tue, 27 Feb 2024 00:12:00 -0600 Subject: [PATCH 2/6] adding bostrt changes --- scripts/start.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/scripts/start.sh b/scripts/start.sh index 4c7c21afe..fde95c828 100644 --- a/scripts/start.sh +++ b/scripts/start.sh @@ -81,6 +81,10 @@ if [ "${MULTITHREADING,,}" = true ]; then STARTCOMMAND+=("-useperfthreads" "-NoAsyncLoadingThread" "-UseMultithreadForDS") fi +if [ "${RCON_ENABLED,,}" = true ]; then + STARTCOMMAND+=("-rconport=${RCON_PORT}") +fi + if [ "${DISABLE_GENERATE_SETTINGS,,}" = true ]; then LogAction "GENERATING CONFIG" LogWarn "Env vars will not be applied due to DISABLE_GENERATE_SETTINGS being set to TRUE!" From c220df5681857363b19cbc35cb9334bce482bfcf Mon Sep 17 00:00:00 2001 From: Thijs van Loef <58031337+thijsvanloef@users.noreply.github.com> Date: Tue, 27 Feb 2024 09:34:14 +0100 Subject: [PATCH 3/6] Also check if RCON port is empty --- scripts/start.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/start.sh b/scripts/start.sh index fde95c828..d4dd3f39e 100644 --- a/scripts/start.sh +++ b/scripts/start.sh @@ -81,7 +81,7 @@ if [ "${MULTITHREADING,,}" = true ]; then STARTCOMMAND+=("-useperfthreads" "-NoAsyncLoadingThread" "-UseMultithreadForDS") fi -if [ "${RCON_ENABLED,,}" = true ]; then +if [ "${RCON_ENABLED,,}" = true ] && [ -n "${RCON_PORT}"]; then STARTCOMMAND+=("-rconport=${RCON_PORT}") fi @@ -162,4 +162,4 @@ echo "${STARTCOMMAND[*]}" "${STARTCOMMAND[@]}" DiscordMessage "${DISCORD_POST_SHUTDOWN_MESSAGE}" "failure" -exit 0 \ No newline at end of file +exit 0 From 6b0c30feabf85655a5dbfbc5ece1906516382039 Mon Sep 17 00:00:00 2001 From: Thijs van Loef <58031337+thijsvanloef@users.noreply.github.com> Date: Tue, 27 Feb 2024 09:34:59 +0100 Subject: [PATCH 4/6] fix linting --- scripts/start.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/start.sh b/scripts/start.sh index d4dd3f39e..06be23f7c 100644 --- a/scripts/start.sh +++ b/scripts/start.sh @@ -81,7 +81,7 @@ if [ "${MULTITHREADING,,}" = true ]; then STARTCOMMAND+=("-useperfthreads" "-NoAsyncLoadingThread" "-UseMultithreadForDS") fi -if [ "${RCON_ENABLED,,}" = true ] && [ -n "${RCON_PORT}"]; then +if [ "${RCON_ENABLED,,}" = true ] && [ -n "${RCON_PORT}" ]; then STARTCOMMAND+=("-rconport=${RCON_PORT}") fi From 6fbc119c6ffe6a80f2de5c1d060be9fd6872cb81 Mon Sep 17 00:00:00 2001 From: Thijs van Loef <58031337+thijsvanloef@users.noreply.github.com> Date: Tue, 27 Feb 2024 09:39:33 +0100 Subject: [PATCH 5/6] use -rcon instead of -rconport --- scripts/start.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/start.sh b/scripts/start.sh index 06be23f7c..40634f568 100644 --- a/scripts/start.sh +++ b/scripts/start.sh @@ -81,8 +81,8 @@ if [ "${MULTITHREADING,,}" = true ]; then STARTCOMMAND+=("-useperfthreads" "-NoAsyncLoadingThread" "-UseMultithreadForDS") fi -if [ "${RCON_ENABLED,,}" = true ] && [ -n "${RCON_PORT}" ]; then - STARTCOMMAND+=("-rconport=${RCON_PORT}") +if [ "${RCON_ENABLED,,}" = true ]; then + STARTCOMMAND+=("-rcon) fi if [ "${DISABLE_GENERATE_SETTINGS,,}" = true ]; then From 6049118e15bc0f71e9e13c7255ddf21f02246672 Mon Sep 17 00:00:00 2001 From: Thijs van Loef <58031337+thijsvanloef@users.noreply.github.com> Date: Tue, 27 Feb 2024 09:40:15 +0100 Subject: [PATCH 6/6] forgot to close string --- scripts/start.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/start.sh b/scripts/start.sh index 40634f568..4acfdf3af 100644 --- a/scripts/start.sh +++ b/scripts/start.sh @@ -82,7 +82,7 @@ if [ "${MULTITHREADING,,}" = true ]; then fi if [ "${RCON_ENABLED,,}" = true ]; then - STARTCOMMAND+=("-rcon) + STARTCOMMAND+=("-rcon") fi if [ "${DISABLE_GENERATE_SETTINGS,,}" = true ]; then