epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Extract error messages to a variable to reduce duplication.

Browse Source
This commit is contained in:
Paul Chote
2018-05-04 23:53:15 +01:00
committed by abcdefg30
parent 562cf2ad44
commit b78e9ee89a
4 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
launch-game.sh
View File

@@ -23,14 +23,13 @@ fi
# Launch the engine with the appropriate arguments # Launch the engine with the appropriate arguments
mono OpenRA.Game.exe Engine.LaunchPath="$MODLAUNCHER" $MODARG "$@" mono OpenRA.Game.exe Engine.LaunchPath="$MODLAUNCHER" $MODARG "$@"
# Show a crash dialog if required # Show a crash dialog if something went wrong
if [ $? != 0 ] && [ $? != 1 ] if [ $? != 0 ] && [ $? != 1 ]; then
then ERROR_MESSAGE="OpenRA has encountered a fatal error.\nPlease refer to the crash logs and FAQ for more information.\n\nLog files are located in ~/.openra/Logs\nThe FAQ is available at http://wiki.openra.net/FAQ"
if which zenity > /dev/null if command -v zenity > /dev/null; then
then zenity --no-wrap --error --title "{MODNAME}" --text "${ERROR_MESSAGE}" 2> /dev/null
zenity --no-wrap --error --title "OpenRA" --text "OpenRA has encountered a fatal error.\nPlease refer to the crash logs and FAQ for more information.\n\nLog files are located in ~/.openra/Logs\nThe FAQ is available at http://wiki.openra.net/FAQ" 2> /dev/null
else else
printf "OpenRA has encountered a fatal error.\nPlease refer to the crash logs and FAQ for more information.\n\nLog files are located in ~/.openra/Logs\nThe FAQ is available at http://wiki.openra.net/FAQ\n" printf "${ERROR_MESSAGE}\n"
fi fi
exit 1 exit 1
fi fi

5
packaging/linux/AppRun.in
View File

@@ -15,10 +15,11 @@ mono_missing_or_old() {
} }
if mono_missing_or_old; then if mono_missing_or_old; then
ERROR_MESSAGE="{MODNAME} requires Mono ${MINIMUM_MONO_VERSION} or greater.\nPlease install Mono using your system package manager."
if command -v zenity > /dev/null; then if command -v zenity > /dev/null; then
zenity --no-wrap --error --title "{MODNAME}" --text "{MODNAME} requires Mono ${MINIMUM_MONO_VERSION} or greater.\nPlease install Mono using your system package manager." 2> /dev/null zenity --no-wrap --error --title "{MODNAME}" --text "${ERROR_MESSAGE}" 2> /dev/null
else else
printf "{MODNAME} requires Mono %s or greater.\nPlease install Mono using your system package manager.\n" "${MINIMUM_MONO_VERSION}" printf "${ERROR_MESSAGE}"
fi fi
exit 1 exit 1
fi fi

5
packaging/linux/openra.appimage.in
View File

@@ -39,10 +39,11 @@ mono --debug OpenRA.Game.exe Game.Mod={MODID} Engine.LaunchPath="${LAUNCHER}" "$
# Show a crash dialog if something went wrong # Show a crash dialog if something went wrong
if [ $? != 0 ] && [ $? != 1 ]; then if [ $? != 0 ] && [ $? != 1 ]; then
ERROR_MESSAGE="{MODNAME} has encountered a fatal error.\nPlease refer to the crash logs and FAQ for more information.\n\nLog files are located in ~/.openra/Logs\nThe FAQ is available at http://wiki.openra.net/FAQ"
if command -v zenity > /dev/null; then if command -v zenity > /dev/null; then
zenity --no-wrap --error --title "{MODNAME}" --text "{MODNAME} has encountered a fatal error.\nPlease refer to the crash logs and FAQ for more information.\n\nLog files are located in ~/.openra/Logs\nThe FAQ is available at http://wiki.openra.net/FAQ" 2> /dev/null zenity --no-wrap --error --title "{MODNAME}" --text "${ERROR_MESSAGE}" 2> /dev/null
else else
printf "{MODNAME} has encountered a fatal error.\nPlease refer to the crash logs and FAQ for more information.\n\nLog files are located in ~/.openra/Logs\nThe FAQ is available at http://wiki.openra.net/FAQ\n" printf "${ERROR_MESSAGE}\n"
fi fi
exit 1 exit 1
fi fi

5
packaging/linux/openra.in
View File

@@ -13,10 +13,11 @@ mono {DEBUG} OpenRA.Game.exe Game.Mod={MODID} Engine.LaunchPath="{BIN_DIR}/openr
# Show a crash dialog if something went wrong # Show a crash dialog if something went wrong
if [ $? != 0 ] && [ $? != 1 ]; then if [ $? != 0 ] && [ $? != 1 ]; then
ERROR_MESSAGE="{MODNAME} has encountered a fatal error.\nPlease refer to the crash logs and FAQ for more information.\n\nLog files are located in ~/.openra/Logs\nThe FAQ is available at http://wiki.openra.net/FAQ"
if command -v zenity > /dev/null; then if command -v zenity > /dev/null; then
zenity --no-wrap --error --title "{MODNAME}" --text "{MODNAME} has encountered a fatal error.\nPlease refer to the crash logs and FAQ for more information.\n\nLog files are located in ~/.openra/Logs\nThe FAQ is available at http://wiki.openra.net/FAQ" 2> /dev/null zenity --no-wrap --error --title "{MODNAME}" --text "${ERROR_MESSAGE}" 2> /dev/null
else else
printf "{MODNAME} has encountered a fatal error.\nPlease refer to the crash logs and FAQ for more information.\n\nLog files are located in ~/.openra/Logs\nThe FAQ is available at http://wiki.openra.net/FAQ\n" printf "${ERROR_MESSAGE}\n"
fi fi
exit 1 exit 1
fi fi