diff options
| author | Jesse Plamondon-Willard <github@jplamondonw.com> | 2018-01-19 21:24:22 -0500 |
|---|---|---|
| committer | Jesse Plamondon-Willard <github@jplamondonw.com> | 2018-01-19 21:24:22 -0500 |
| commit | 32defd60e2e1ce4d153c567f75343111e4597684 (patch) | |
| tree | 2c002e5b7c8fef98c3f62d3723c8f0235e61dcb2 | |
| parent | b87d6da6c514c40f01396bfd8e403eb0a5f2e25c (diff) | |
| download | SMAPI-32defd60e2e1ce4d153c567f75343111e4597684.tar.gz SMAPI-32defd60e2e1ce4d153c567f75343111e4597684.tar.bz2 SMAPI-32defd60e2e1ce4d153c567f75343111e4597684.zip | |
tweak new script, document workaround, update release notes
| -rw-r--r-- | docs/release-notes.md | 1 | ||||
| -rw-r--r-- | src/SMAPI/unix-launcher.sh | 5 |
2 files changed, 5 insertions, 1 deletions
diff --git a/docs/release-notes.md b/docs/release-notes.md index 4b6a7ba5..2f136509 100644 --- a/docs/release-notes.md +++ b/docs/release-notes.md @@ -4,6 +4,7 @@ * SMAPI now fixes curly quotes in `config.json` if possible. * Fixed semantic versions always ignoring `-0` tag. * Fixed rare issues caused by assembly references being incorrectly loaded twice. + * Fixed error on Linux loading SMAPI when the default terminal is set to Terminator. * For the [log parser][]: * Fixed parse error for logs with zero installed mods. diff --git a/src/SMAPI/unix-launcher.sh b/src/SMAPI/unix-launcher.sh index 30021470..2542a286 100644 --- a/src/SMAPI/unix-launcher.sh +++ b/src/SMAPI/unix-launcher.sh @@ -63,7 +63,10 @@ else # open SMAPI in terminal if $COMMAND x-terminal-emulator 2>/dev/null; then - if [[ " $(readlink $(readlink /usr/bin/x-terminal-emulator))" == *"/terminator" ]]; 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. + if [[ "$(readlink -e $(which x-terminal-emulator))" == *"/terminator" ]]; then terminator -e "$LAUNCHER" else x-terminal-emulator -e "$LAUNCHER" |