Remove needless split between blocks

This commit is contained in:
Dylan Araps 2016-05-28 10:14:45 +10:00
parent d504968041
commit 91b66052f1

View file

@ -1739,17 +1739,16 @@ getfont () {
# Terminal Emulator {{{ # Terminal Emulator {{{
getterm () { getterm () {
# Workaround for OS X systems that # Check $PPID for terminal emulator.
# don't support the block below. case "$os" in
"Darwin")
case "$TERM_PROGRAM" in case "$TERM_PROGRAM" in
"iTerm.app") term="iTerm2" ;; "iTerm.app") term="iTerm2" ;;
"Terminal.app") term="Apple Terminal" ;; "Terminal.app") term="Apple Terminal" ;;
*) term="${TERM_PROGRAM/\.app}" ;; *) term="${TERM_PROGRAM/\.app}" ;;
esac esac
;;
# Check $PPID for terminal emulator.
if [ -z "$term" ]; then
case "$os" in
"Windows") "Windows")
parent="$(ps -p ${1:-$PPID} | awk '{printf $2}')" parent="$(ps -p ${1:-$PPID} | awk '{printf $2}')"
parent=${parent/'PPID'} parent=${parent/'PPID'}
@ -1769,7 +1768,6 @@ getterm () {
"${SHELL/*\/}" | *"sh" | "tmux" | "screen" | "systemd") getterm "$parent" ;; "${SHELL/*\/}" | *"sh" | "tmux" | "screen" | "systemd") getterm "$parent" ;;
*) term="$name" ;; *) term="$name" ;;
esac esac
fi
} }
# }}} # }}}