devbeni/yolks
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ci(source): change startup parsing to eval

Browse Source 
exec does not support startups that are more keen of scripts with multiple breaks and statements. Ark or 7d2d are examples of this.

ref https://github.com/parkervcp/eggs/pull/1420
This commit is contained in:
Alex
2021-12-07 15:30:41 +02:00
parent fe82cc0ac0
commit 2e366792c1
1 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
games/source/entrypoint.sh
View File

@@ -36,10 +36,6 @@ export INTERNAL_IP
# Switch to the container's working directory # Switch to the container's working directory
cd /home/container || exit 1 cd /home/container || exit 1
# Convert all of the "{{VARIABLE}}" parts of the command into the expected shell
# variable format of "${VARIABLE}" before evaluating the string and automatically
# replacing the values.
PARSED=$(echo "${STARTUP}" | sed -e 's/{{/${/g' -e 's/}}/}/g' | eval echo "$(cat -)")
## just in case someone removed the defaults. ## just in case someone removed the defaults.
if [ "${STEAM_USER}" == "" ]; then if [ "${STEAM_USER}" == "" ]; then
@@ -65,8 +61,9 @@ else
echo -e "Not updating game server as auto update was set to 0. Starting Server" echo -e "Not updating game server as auto update was set to 0. Starting Server"
fi fi
# Display the command we're running in the output, and then execute it with the env # Replace Startup Variables
# from the container itself. MODIFIED_STARTUP=$(echo ${STARTUP} | sed -e 's/{{/${/g' -e 's/}}/}/g')
printf "\033[1m\033[33mcontainer@pterodactyl~ \033[0m%s\n" "$PARSED" echo -e ":/home/container$ ${MODIFIED_STARTUP}"
# shellcheck disable=SC2086
exec env ${PARSED} # Run the Server
eval ${MODIFIED_STARTUP}