summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJesse Plamondon-Willard <github@jplamondonw.com>2018-01-19 21:24:22 -0500
committerJesse Plamondon-Willard <github@jplamondonw.com>2018-01-19 21:24:22 -0500
commit32defd60e2e1ce4d153c567f75343111e4597684 (patch)
tree2c002e5b7c8fef98c3f62d3723c8f0235e61dcb2 /src
parentb87d6da6c514c40f01396bfd8e403eb0a5f2e25c (diff)
downloadSMAPI-32defd60e2e1ce4d153c567f75343111e4597684.tar.gz
SMAPI-32defd60e2e1ce4d153c567f75343111e4597684.tar.bz2
SMAPI-32defd60e2e1ce4d153c567f75343111e4597684.zip
tweak new script, document workaround, update release notes
Diffstat (limited to 'src')
-rw-r--r--src/SMAPI/unix-launcher.sh5
1 files changed, 4 insertions, 1 deletions
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"