prefer xterm when launching SMAPI

This commit is contained in:
Jesse Plamondon-Willard 2018-09-18 17:49:36 -04:00
parent 5f8674e8a3
commit 43a3af1a67
2 changed files with 4 additions and 3 deletions

View File

@ -5,6 +5,7 @@
* Moved most SMAPI files into a `smapi-internal` subfolder.
* Moved save backups into a `save-backups` subfolder (instead of `Mods/SaveBackup/backups`). Note that previous backups will be deleted when you update.
* Update checks now work even when the mod has no update keys in most cases.
* Fixed compatibility issues for some Linux players. SMAPI will now always use xterm if it's available.
* Fixed some game install paths not detected on Windows.
* Fixed installer duplicating bundled mods if you moved them after the last install.
* Fixed crash when a mod manifest is corrupted.

View File

@ -62,7 +62,9 @@ else
fi
# open SMAPI in terminal
if $COMMAND x-terminal-emulator 2>/dev/null; then
if $COMMAND xterm 2>/dev/null; then
xterm -e "$LAUNCHER"
elif $COMMAND x-terminal-emulator 2>/dev/null; then
# Terminator converts -e to -x when used through x-terminal-emulator for some reason (per
# `man terminator`), which causes an "unable to find shell" error. If x-terminal-emulator
# is mapped to Terminator, invoke it directly instead.
@ -71,8 +73,6 @@ 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 "env TERM=xterm; $LAUNCHER"
elif $COMMAND gnome-terminal 2>/dev/null; then