summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlbert Zhang <alchzh@gmail.com>2018-03-05 20:16:47 -0500
committerGitHub <noreply@github.com>2018-03-05 20:16:47 -0500
commit810f700ced289a27962a8ec31587f5557ea740db (patch)
tree794dd3042cef972382c901c6e12c1ee02fa7c43f
parent8689fe65642d07fa6a2513aa36c1389479e50d0c (diff)
downloadSMAPI-810f700ced289a27962a8ec31587f5557ea740db.tar.gz
SMAPI-810f700ced289a27962a8ec31587f5557ea740db.tar.bz2
SMAPI-810f700ced289a27962a8ec31587f5557ea740db.zip
move `xterm` to top of terminal checking order
Makes more sense, as `xterm` is much more common than any of the others and we only need a barebones terminal anyway. This also solves errors caused by issues such as https://github.com/mono/mono/issues/6752
-rw-r--r--src/SMAPI.Installer/unix-launcher.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/SMAPI.Installer/unix-launcher.sh b/src/SMAPI.Installer/unix-launcher.sh
index 2542a286..6e796461 100644
--- a/src/SMAPI.Installer/unix-launcher.sh
+++ b/src/SMAPI.Installer/unix-launcher.sh
@@ -71,12 +71,12 @@ else
else
x-terminal-emulator -e "$LAUNCHER"
fi
+ elif $COMMAND xterm 2>/dev/null; then
+ xterm -e "$LAUNCHER"
elif $COMMAND xfce4-terminal 2>/dev/null; then
xfce4-terminal -e "$LAUNCHER"
elif $COMMAND gnome-terminal 2>/dev/null; then
gnome-terminal -e "$LAUNCHER"
- elif $COMMAND xterm 2>/dev/null; then
- xterm -e "$LAUNCHER"
elif $COMMAND konsole 2>/dev/null; then
konsole -e "$LAUNCHER"
elif $COMMAND terminal 2>/dev/null; then