678f249c63
Error messages are displayed using the following methods: * **zenity** parses pango markup and replaces escaped characters * **kdialog** replaces (some) escaped characters * **gtk-dialog.py** replaces `\n` * **printf** interprets format strings and replaces escaped characters * **echo** just displays the text The error messages themself contain escaped characters and paths from variables. This PR unifies the behavior by: * Use **printf** to format error messages and replace escaped characters * Setting `--no-markup` for **zenity** to disable pango markup and escaped characters * Remove `\n` replacement from **gtk-dialog.py**. * Use plain **echo** instead of **printf**
32 lines
1.1 KiB
Bash
Executable File
32 lines
1.1 KiB
Bash
Executable File
#!/bin/sh
|
|
cd "{GAME_INSTALL_DIR}"
|
|
|
|
# Search for server connection
|
|
PROTOCOL_PREFIX="openra-{MODID}-{TAG}://"
|
|
JOIN_SERVER=""
|
|
if [ "${1#${PROTOCOL_PREFIX}}" != "${1}" ]; then
|
|
JOIN_SERVER="Launch.Connect=${1#${PROTOCOL_PREFIX}}"
|
|
fi
|
|
|
|
# Run the game
|
|
mono {DEBUG} OpenRA.dll Game.Mod={MODID} Engine.LaunchPath="{BIN_DIR}/openra-{MODID}" "${JOIN_SERVER}" "$@"
|
|
|
|
# Show a crash dialog if something went wrong
|
|
if [ $? != 0 ] && [ $? != 1 ]; then
|
|
LOGS="${XDG_CONFIG_HOME:-${HOME}/.config}/openra/Logs"
|
|
if [ ! -d "${LOGS}" ] && [ -d "${HOME}/.openra/Logs" ]; then
|
|
LOGS="${HOME}/.openra/Logs"
|
|
fi
|
|
|
|
test -d Support/Logs && LOGS="${PWD}/Support/Logs"
|
|
ERROR_MESSAGE=$(printf "%s has encountered a fatal error.\nPlease refer to the crash logs and FAQ for more information.\n\nLog files are located in %s\nThe FAQ is available at http://wiki.openra.net/FAQ" "{MODNAME}" "${LOGS}")
|
|
if command -v zenity > /dev/null; then
|
|
zenity --no-wrap --error --title "{MODNAME}" --no-markup --text "${ERROR_MESSAGE}" 2> /dev/null
|
|
elif command -v kdialog > /dev/null; then
|
|
kdialog --title "{MODNAME}" --error "${ERROR_MESSAGE}"
|
|
else
|
|
echo "${ERROR_MESSAGE}"
|
|
fi
|
|
exit 1
|
|
fi
|