Merge branch 'term_font' of github.com:dylanaraps/neofetch into term_font

specially if it merges an updated upstream into a topic branch.
This commit is contained in:
Dylan Araps 2016-05-17 00:08:03 +10:00
commit 2bf353eaab

View file

@ -1738,13 +1738,18 @@ getfont () {
# Terminal Emulator {{{
getterm () {
parent="$(ps -p ${1:-$PPID} -o ppid=)"
name="$(ps -p $parent -o comm=)"
[ -n "$ITERM_PROFILE" ] && term="iTerm2"
case "$name" in
"${SHELL/*\/}" | *"sh") getterm "$parent" ;;
*) term="$name" ;;
esac
# Check $PPID for terminal emulator.
if [ -z "$term" ]; then
parent="$(ps -p ${1:-$PPID} -o ppid=)"
name="$(ps -p $parent -o comm=)"
case "$name" in
"${SHELL/*\/}" | *"sh" | "tmux") getterm "$parent" ;;
*) term="$name" ;;
esac
fi
}
# }}}