From b87d6da6c514c40f01396bfd8e403eb0a5f2e25c Mon Sep 17 00:00:00 2001 From: EnderHDMC Date: Mon, 15 Jan 2018 23:33:43 +0200 Subject: Update unix-launcher.sh --- src/SMAPI/unix-launcher.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/SMAPI/unix-launcher.sh b/src/SMAPI/unix-launcher.sh index 70f1873a..30021470 100644 --- a/src/SMAPI/unix-launcher.sh +++ b/src/SMAPI/unix-launcher.sh @@ -63,7 +63,11 @@ else # open SMAPI in terminal if $COMMAND x-terminal-emulator 2>/dev/null; then - x-terminal-emulator -e "$LAUNCHER" + if [[ " $(readlink $(readlink /usr/bin/x-terminal-emulator))" == *"/terminator" ]]; then + terminator -e "$LAUNCHER" + else + x-terminal-emulator -e "$LAUNCHER" + fi elif $COMMAND xfce4-terminal 2>/dev/null; then xfce4-terminal -e "$LAUNCHER" elif $COMMAND gnome-terminal 2>/dev/null; then -- cgit From 32defd60e2e1ce4d153c567f75343111e4597684 Mon Sep 17 00:00:00 2001 From: Jesse Plamondon-Willard Date: Fri, 19 Jan 2018 21:24:22 -0500 Subject: tweak new script, document workaround, update release notes --- docs/release-notes.md | 1 + src/SMAPI/unix-launcher.sh | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) 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" -- cgit