summaryrefslogtreecommitdiff
path: root/zsh
diff options
context:
space:
mode:
authorPatrick Simianer <p@simianer.de>2017-12-20 23:46:54 +0100
committerPatrick Simianer <p@simianer.de>2017-12-20 23:46:54 +0100
commitb64a4770a8a193cebaea287763c7b7cd8eb1550b (patch)
tree8616816b642e5973d8eaf55ef81ae321182767f4 /zsh
parentea6826594accd4006b82d9e6e95b329101afb257 (diff)
zsh: fix endless loop
Diffstat (limited to 'zsh')
-rw-r--r--zsh/.zshrc11
1 files 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
}