StardewValley
/
SMAPI
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #600 from liquid600pgm/patch-1 

Made the unix launcher compatible with any shell
This commit is contained in:
Jesse Plamondon-Willard 2018-11-14 20:52:53 -05:00 committed by GitHub
parent fb0d101ab8 76f1a37c16
commit bce6a0552b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/SMAPI.Installer/unix-launcher.sh
View File

@ -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