Fix posix compatibility and code style of shell scripts.

This commit is contained in:
Paul Chote 2017-05-29 12:44:44 +01:00
parent a4413d82b9
commit 50e5c4b342
3 changed files with 15 additions and 16 deletions

View File

@ -8,27 +8,26 @@
TEMPLATE_LAUNCHER=$(python -c "import os; print(os.path.realpath('$0'))") TEMPLATE_LAUNCHER=$(python -c "import os; print(os.path.realpath('$0'))")
TEMPLATE_ROOT=$(dirname "${TEMPLATE_LAUNCHER}") TEMPLATE_ROOT=$(dirname "${TEMPLATE_LAUNCHER}")
source ${TEMPLATE_ROOT}/mod.config . "${TEMPLATE_ROOT}/mod.config"
MOD_SEARCH_PATHS="${TEMPLATE_ROOT}/mods" MOD_SEARCH_PATHS="${TEMPLATE_ROOT}/mods"
if [ "${INCLUDE_DEFAULT_MODS}" = "True" ]; then if [ "${INCLUDE_DEFAULT_MODS}" = "True" ]; then
MOD_SEARCH_PATHS="${TEMPLATE_PATHS},./mods" MOD_SEARCH_PATHS="${TEMPLATE_PATHS},./mods"
fi fi
NAME="${Name:-"Dedicated Server"}"
LAUNCH_MOD="${Mod:-"${MOD_ID}"}" LAUNCH_MOD="${Mod:-"${MOD_ID}"}"
LISTEN_PORT="${ListenPort:-"1234"}"
Name="${Name:-"Dedicated Server"}" EXTERNAL_PORT="${ExternalPort:-"1234"}"
Mod="${Mod:-"${MOD_ID}"}" ADVERTISE_ONLINE="${AdvertiseOnline:-"True"}"
ListenPort="${ListenPort:-"1234"}" ENABLE_SINGLE_PLAYER="${EnableSingleplayer:-"False"}"
ExternalPort="${ExternalPort:-"1234"}" PASSWORD="${Password:-""}"
AdvertiseOnline="${AdvertiseOnline:-"True"}"
EnableSingleplayer="${EnableSingleplayer:-"False"}"
Password="${Password:-""}"
cd engine cd engine
while true; do while true; do
MOD_SEARCH_PATHS="${MOD_SEARCH_PATHS}" mono --debug OpenRA.Server.exe Game.Mod=$Mod \ MOD_SEARCH_PATHS="${MOD_SEARCH_PATHS}" mono --debug OpenRA.Server.exe Game.Mod="${LAUNCH_MOD}" \
Server.Name="$Name" Server.ListenPort=$ListenPort Server.ExternalPort=$ExternalPort \ Server.Name="${NAME}" Server.ListenPort="${LISTEN_PORT}" Server.ExternalPort="${EXTERNAL_PORT}" \
Server.AdvertiseOnline=$AdvertiseOnline \ Server.AdvertiseOnline="${ADVERTISE_ONLINE}" \
Server.EnableSingleplayer=$EnableSingleplayer Server.Password=$Password Server.EnableSingleplayer="${ENABLE_SINGLE_PLAYER}" Server.Password="${PASSWORD}"
done done

View File

@ -2,7 +2,7 @@
TEMPLATE_LAUNCHER=$(python -c "import os; print(os.path.realpath('$0'))") TEMPLATE_LAUNCHER=$(python -c "import os; print(os.path.realpath('$0'))")
TEMPLATE_ROOT=$(dirname "${TEMPLATE_LAUNCHER}") TEMPLATE_ROOT=$(dirname "${TEMPLATE_LAUNCHER}")
source ${TEMPLATE_ROOT}/mod.config . "${TEMPLATE_ROOT}/mod.config"
MOD_SEARCH_PATHS="${TEMPLATE_ROOT}/mods" MOD_SEARCH_PATHS="${TEMPLATE_ROOT}/mods"
if [ "${INCLUDE_DEFAULT_MODS}" = "True" ]; then if [ "${INCLUDE_DEFAULT_MODS}" = "True" ]; then

View File

@ -5,7 +5,7 @@
TEMPLATE_LAUNCHER=$(python -c "import os; print(os.path.realpath('$0'))") TEMPLATE_LAUNCHER=$(python -c "import os; print(os.path.realpath('$0'))")
TEMPLATE_ROOT=$(dirname "${TEMPLATE_LAUNCHER}") TEMPLATE_ROOT=$(dirname "${TEMPLATE_LAUNCHER}")
source ${TEMPLATE_ROOT}/mod.config . "${TEMPLATE_ROOT}/mod.config"
MOD_SEARCH_PATHS="${TEMPLATE_ROOT}/mods" MOD_SEARCH_PATHS="${TEMPLATE_ROOT}/mods"
if [ "${INCLUDE_DEFAULT_MODS}" = "True" ]; then if [ "${INCLUDE_DEFAULT_MODS}" = "True" ]; then
@ -15,4 +15,4 @@ fi
LAUNCH_MOD="${Mod:-"${MOD_ID}"}" LAUNCH_MOD="${Mod:-"${MOD_ID}"}"
cd engine cd engine
MOD_SEARCH_PATHS="${MOD_SEARCH_PATHS}" mono --debug OpenRA.Utility.exe ${LAUNCH_MOD} $@ MOD_SEARCH_PATHS="${MOD_SEARCH_PATHS}" mono --debug OpenRA.Utility.exe "${LAUNCH_MOD}" "$@"