diff options
| author | Jesse Plamondon-Willard <github@jplamondonw.com> | 2018-09-18 17:49:36 -0400 |
|---|---|---|
| committer | Jesse Plamondon-Willard <github@jplamondonw.com> | 2018-09-18 17:49:36 -0400 |
| commit | 43a3af1a671c46b48b4c4eb5ab1552d1177cb9fb (patch) | |
| tree | 99dace618dbcf42962a9bdeaf18470a0cfd5d28f | |
| parent | 5f8674e8a37c9fda5561b66910e571420000a219 (diff) | |
| download | SMAPI-43a3af1a671c46b48b4c4eb5ab1552d1177cb9fb.tar.gz SMAPI-43a3af1a671c46b48b4c4eb5ab1552d1177cb9fb.tar.bz2 SMAPI-43a3af1a671c46b48b4c4eb5ab1552d1177cb9fb.zip | |
prefer xterm when launching SMAPI
| -rw-r--r-- | docs/release-notes.md | 1 | ||||
| -rw-r--r-- | src/SMAPI.Installer/unix-launcher.sh | 6 |
2 files changed, 4 insertions, 3 deletions
diff --git a/docs/release-notes.md b/docs/release-notes.md index b9cee4c6..cb9e8788 100644 --- a/docs/release-notes.md +++ b/docs/release-notes.md @@ -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. diff --git a/src/SMAPI.Installer/unix-launcher.sh b/src/SMAPI.Installer/unix-launcher.sh index 1e969c20..b64c021c 100644 --- a/src/SMAPI.Installer/unix-launcher.sh +++ b/src/SMAPI.Installer/unix-launcher.sh @@ -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 |