diff --git a/launch-game.sh b/launch-game.sh index 01adb1bb1d..a66e014a28 100755 --- a/launch-game.sh +++ b/launch-game.sh @@ -46,9 +46,9 @@ if [ $? != 0 ] && [ $? != 1 ]; then fi test -d Support/Logs && LOGS="${PWD}/Support/Logs" - 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 ${LOGS}\nThe FAQ is available at http://wiki.openra.net/FAQ" + 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" "OpenRA" "${LOGS}") if command -v zenity > /dev/null; then - zenity --no-wrap --error --title "OpenRA" --text "${ERROR_MESSAGE}" 2> /dev/null + zenity --no-wrap --error --title "OpenRA" --no-markup --text "${ERROR_MESSAGE}" 2> /dev/null elif command -v kdialog > /dev/null; then kdialog --title "OpenRA" --error "${ERROR_MESSAGE}" else diff --git a/packaging/linux/gtk-dialog.py b/packaging/linux/gtk-dialog.py index 337f9b94fa..3c967451ad 100644 --- a/packaging/linux/gtk-dialog.py +++ b/packaging/linux/gtk-dialog.py @@ -43,6 +43,6 @@ if __name__ == "__main__": parser.add_argument('--text', type=str, required=False, default='') args = parser.parse_args() if args.type == 'question': - Question(args.title, args.text.replace('\\n', '\n')) + Question(args.title, args.text) elif args.type == 'error': - Error(args.title, args.text.replace('\\n', '\n')) + Error(args.title, args.text) diff --git a/packaging/linux/openra.appimage.in b/packaging/linux/openra.appimage.in index 45cac44b4f..2d8e4e8335 100755 --- a/packaging/linux/openra.appimage.in +++ b/packaging/linux/openra.appimage.in @@ -53,15 +53,15 @@ if [ $? != 0 ] && [ $? != 1 ]; then fi test -d Support/Logs && LOGS="${PWD}/Support/Logs" - 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 ${LOGS}\nThe FAQ is available at http://wiki.openra.net/FAQ" + 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}" --text "${ERROR_MESSAGE}" 2> /dev/null + 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}" elif "${HERE}/gtk-dialog.py" test > /dev/null; then "${HERE}/gtk-dialog.py" error --title "{MODNAME}" --text "${ERROR_MESSAGE}" 2> /dev/null else - printf "${ERROR_MESSAGE}\n" + echo "${ERROR_MESSAGE}" fi exit 1 fi diff --git a/packaging/linux/openra.in b/packaging/linux/openra.in index 85bcec0ca0..3068693425 100755 --- a/packaging/linux/openra.in +++ b/packaging/linux/openra.in @@ -19,13 +19,13 @@ if [ $? != 0 ] && [ $? != 1 ]; then fi test -d Support/Logs && LOGS="${PWD}/Support/Logs" - 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 ${LOGS}\nThe FAQ is available at http://wiki.openra.net/FAQ" + 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}" --text "${ERROR_MESSAGE}" 2> /dev/null + 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 - printf "${ERROR_MESSAGE}\n" + echo "${ERROR_MESSAGE}" fi exit 1 fi