diff options
| author | Jesse Plamondon-Willard <Pathoschild@users.noreply.github.com> | 2018-11-14 20:52:53 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-14 20:52:53 -0500 |
| commit | bce6a0552b69ec28cf7fafdc88fa3ed7a40d019b (patch) | |
| tree | c62c1048915b620e743d2d946f827c0a081e3fa2 /src | |
| parent | fb0d101ab822145fb70dbfbdc261f6596b160a4f (diff) | |
| parent | 76f1a37c166327d41646d797191101c8446376d8 (diff) | |
| download | SMAPI-bce6a0552b69ec28cf7fafdc88fa3ed7a40d019b.tar.gz SMAPI-bce6a0552b69ec28cf7fafdc88fa3ed7a40d019b.tar.bz2 SMAPI-bce6a0552b69ec28cf7fafdc88fa3ed7a40d019b.zip | |
Merge pull request #600 from liquid600pgm/patch-1
Made the unix launcher compatible with any shell
Diffstat (limited to 'src')
| -rw-r--r-- | src/SMAPI.Installer/unix-launcher.sh | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/SMAPI.Installer/unix-launcher.sh b/src/SMAPI.Installer/unix-launcher.sh index b64c021c..3c332472 100644 --- a/src/SMAPI.Installer/unix-launcher.sh +++ b/src/SMAPI.Installer/unix-launcher.sh @@ -69,20 +69,20 @@ else # `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" + terminator -e "sh -c 'TERM=xterm $LAUNCHER'" else - x-terminal-emulator -e "$LAUNCHER" + x-terminal-emulator -e "sh -c 'TERM=xterm $LAUNCHER'" fi elif $COMMAND xfce4-terminal 2>/dev/null; then - xfce4-terminal -e "env TERM=xterm; $LAUNCHER" + xfce4-terminal -e "sh -c 'TERM=xterm $LAUNCHER'" elif $COMMAND gnome-terminal 2>/dev/null; then - gnome-terminal -e "env TERM=xterm; $LAUNCHER" + gnome-terminal -e "sh -c 'TERM=xterm $LAUNCHER'" elif $COMMAND konsole 2>/dev/null; then konsole -p Environment=TERM=xterm -e "$LAUNCHER" elif $COMMAND terminal 2>/dev/null; then - terminal -e "$LAUNCHER" + terminal -e "sh -c 'TERM=xterm $LAUNCHER'" else - $LAUNCHER + sh -c 'TERM=xterm $LAUNCHER' fi # some Linux users get error 127 (command not found) from the above block, even though |