commit acffdcb6eed3385e1566c0ac86fb6b4bc130664b parent b962b25ecaf6ddb11a36235d4a9849a147b4f6a3 Author: Russ Cox <rsc@swtch.com> Date: Tue, 5 May 2020 09:30:15 -0400 9term.app: respect user-set shell instead of forcing bash Diffstat:
| M | mac/9term.app/Contents/MacOS/9term | | | 24 | ++++++++++++++++++++++-- |
1 file changed, 22 insertions(+), 2 deletions(-)
diff --git a/mac/9term.app/Contents/MacOS/9term b/mac/9term.app/Contents/MacOS/9term @@ -1,9 +1,29 @@ #!/bin/bash -cd $HOME -. ~/.bashrc +fshell=$(finger $(whoami) | sed -n 's/.*Shell: //p' | sed 1q) +SHELL=${fshell:-$SHELL} PLAN9=${PLAN9:-/usr/local/plan9} +cd $HOME +case "$SHELL" in +*/rc) + echo ' + if(! ~ $PLAN9/bin $path) + path=($path $PLAN9/bin) + $PLAN9/bin/9term -l -W600x800 & + ' | $SHELL -l + exit 0 + ;; +*/bash) + . ~/.bash_profile + ;; +*) + . ~/.profile + ;; +esac + if ! [[ :$PATH: =~ :$PLAN9/bin: ]] then PATH=$PATH:$PLAN9/bin fi $PLAN9/bin/9term -l -W600x800 & +exit 0 +