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