From b64a4770a8a193cebaea287763c7b7cd8eb1550b Mon Sep 17 00:00:00 2001 From: Patrick Simianer
Date: Wed, 20 Dec 2017 23:46:54 +0100 Subject: zsh: fix endless loop --- zsh/.zshrc | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/zsh/.zshrc b/zsh/.zshrc index b127914..d1473b6 100644 --- a/zsh/.zshrc +++ b/zsh/.zshrc @@ -70,7 +70,7 @@ case $_HOST_TYPE in esac # get a white background in mutt -COLORFGBG="default;default" +#COLORFGBG="White;Black" # ############################################################################# # terminal @@ -164,7 +164,7 @@ esac # ############################################################################# case `hostname` in - 2pac|CLuster|node*|gpu*|coltrane|donna|vicious|lemmy) + 2pac|CLuster|coltrane|donna|vicious|lemmy) umask u=rwx,g=rwx,o=rx alias tmux="tmux -f ~/.tmux.`hostname`.conf" ;; @@ -260,16 +260,17 @@ diff () if [[ -x $(which colordiff 2>/dev/null) ]]; then colordiff "$@" else - diff "$@" + command diff "$@" fi } irb () { - if [[ -x $(which pry 2>/dev/null) ]]; then + which pry &>/dev/null + if [[ $? -eq 0 ]]; then pry "$@" else - irb "$@" + command irb "$@" fi } -- cgit v1.2.3