From b78e9ee89aac505f3bc97425d8c5e3c9d69a809e Mon Sep 17 00:00:00 2001
From: Paul Chote <pchote@users.noreply.github.com>
Date: Fri, 4 May 2018 23:53:15 +0100
Subject: [PATCH] Extract error messages to a variable to reduce duplication.

---
 launch-game.sh                     | 13 ++++++-------
 packaging/linux/AppRun.in          |  5 +++--
 packaging/linux/openra.appimage.in |  5 +++--
 packaging/linux/openra.in          |  5 +++--
 4 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/launch-game.sh b/launch-game.sh
index ed4f89f1b8..cfe883a35c 100755
--- a/launch-game.sh
+++ b/launch-game.sh
@@ -23,14 +23,13 @@ fi
 # Launch the engine with the appropriate arguments
 mono OpenRA.Game.exe Engine.LaunchPath="$MODLAUNCHER" $MODARG "$@"
 
-# Show a crash dialog if required
-if [ $? != 0 ] && [ $? != 1 ]
-then
-	if which zenity > /dev/null
-	then
-		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
+# Show a crash dialog if something went wrong
+if [ $? != 0 ] && [ $? != 1 ]; 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 command -v zenity > /dev/null; then
+		zenity --no-wrap --error --title "{MODNAME}" --text "${ERROR_MESSAGE}" 2> /dev/null
 	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
 	exit 1
 fi
diff --git a/packaging/linux/AppRun.in b/packaging/linux/AppRun.in
index 0e6c0097c8..85ed11c812 100755
--- a/packaging/linux/AppRun.in
+++ b/packaging/linux/AppRun.in
@@ -15,10 +15,11 @@ mono_missing_or_old() {
 }
 
 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
-    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
-    printf "{MODNAME} requires Mono %s or greater.\nPlease install Mono using your system package manager.\n" "${MINIMUM_MONO_VERSION}"
+    printf "${ERROR_MESSAGE}"
   fi
   exit 1
 fi
diff --git a/packaging/linux/openra.appimage.in b/packaging/linux/openra.appimage.in
index 43444c3d9b..5fc18ab8d3 100755
--- a/packaging/linux/openra.appimage.in
+++ b/packaging/linux/openra.appimage.in
@@ -39,10 +39,11 @@ mono --debug OpenRA.Game.exe Game.Mod={MODID} Engine.LaunchPath="${LAUNCHER}" "$
 
 # Show a crash dialog if something went wrong
 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
-    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
-    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
   exit 1
 fi
diff --git a/packaging/linux/openra.in b/packaging/linux/openra.in
index cd89fc2d3e..6c2f841be4 100755
--- a/packaging/linux/openra.in
+++ b/packaging/linux/openra.in
@@ -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
 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
-    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
-    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
   exit 1
 fi