Merge branch 'thijsvanloef:main' into Server-Description

This commit is contained in:
Carlos Martinez
2024-01-26 12:22:39 -05:00
committed by GitHub

View File

@@ -1,29 +1,29 @@
#!/bin/bash
STARTCOMMAND="./PalServer.sh"
STARTCOMMAND=("./PalServer.sh")
if [ -n "${PORT}" ]; then
STARTCOMMAND="${STARTCOMMAND} -port=${PORT}"
STARTCOMMAND+=("-port=${PORT}")
fi
if [ -n "${PLAYERS}" ]; then
STARTCOMMAND="${STARTCOMMAND} -players=${PLAYERS}"
STARTCOMMAND+=("-players=${PLAYERS}")
fi
if [ "${COMMUNITY}" = true ]; then
STARTCOMMAND="${STARTCOMMAND} EpicApp=PalServer"
STARTCOMMAND+=("EpicApp=PalServer")
fi
if [ -n "${PUBLIC_IP}" ]; then
STARTCOMMAND="${STARTCOMMAND} -publicip=${PUBLIC_IP}"
STARTCOMMAND+=("-publicip=${PUBLIC_IP}")
fi
if [ -n "${PUBLIC_PORT}" ]; then
STARTCOMMAND="${STARTCOMMAND} -publicport=${PUBLIC_PORT}"
STARTCOMMAND+=("-publicport=${PUBLIC_PORT}")
fi
if [ -n "${SERVER_NAME}" ]; then
STARTCOMMAND="${STARTCOMMAND} -servername=${SERVER_NAME}"
STARTCOMMAND+=("-servername=${SERVER_NAME}")
fi
if [ -n "${SERVER_DESCRIPTION}" ]; then
@@ -31,19 +31,19 @@ if [ -n "${SERVER_DESCRIPTION}" ]; then
fi
if [ -n "${SERVER_PASSWORD}" ]; then
STARTCOMMAND="${STARTCOMMAND} -serverpassword=${SERVER_PASSWORD}"
STARTCOMMAND+=("-serverpassword=${SERVER_PASSWORD}")
fi
if [ -n "${ADMIN_PASSWORD}" ]; then
STARTCOMMAND="${STARTCOMMAND} -adminpassword=${ADMIN_PASSWORD}"
STARTCOMMAND+=("-adminpassword=${ADMIN_PASSWORD}")
fi
if [ -n "${QUERY_PORT}" ]; then
STARTCOMMAND="${STARTCOMMAND} -queryport=${QUERY_PORT}"
STARTCOMMAND+=("-queryport=${QUERY_PORT}")
fi
if [ "${MULTITHREADING}" = true ]; then
STARTCOMMAND="${STARTCOMMAND} -useperfthreads -NoAsyncLoadingThread -UseMultithreadForDS"
STARTCOMMAND+=("-useperfthreads" "-NoAsyncLoadingThread" "-UseMultithreadForDS")
fi
cd /palworld || exit
@@ -79,5 +79,5 @@ password: ${ADMIN_PASSWORD}
EOL
printf "\e[0;32m*****STARTING SERVER*****\e[0m\n"
echo "${STARTCOMMAND}"
su steam -c "${STARTCOMMAND}"
echo "${STARTCOMMAND[@]}"
su steam -c "${STARTCOMMAND[@]}"