Don't try to alias unconditionally.

git-svn-id: https://svn.cambridge.iain.cx/profile/trunk@104 6be0d1a5-5cfe-0310-89b6-964be062b18b

diff --git a/.profile.d/aliases.bashrc b/.profile.d/aliases.bashrc
index c858a7a..bb244a7 100644 (file)
--- a/.profile.d/aliases.bashrc
+++ b/.profile.d/aliases.bashrc
@@ -1,9 +1,11 @@
 # $Id$
-alias grep='grep --color=auto'
+grep -V | grep GNU &>/dev/null && alias grep='grep --color=auto'
 alias knh='kill_known_host'
 alias l='ls'
 alias ls='/bin/ls $LS_OPTIONS'
-alias vim='vim +syn\ on'
-alias vi='vim'
+if which vim &>/dev/null; then
+  alias vim='vim +syn\ on'
+  alias vi='vim'
+fi
 alias debug='valgrind --tool=memcheck --leak-check=yes --show-reachable=yes --num-callers=5 --verbose --time-stamp=yes --track-fds=yes'
 alias svnfind='find . -type f ! -path "*/.svn/*"'