bin/diff-filter: Use local `diff-highlight` script if available
[dotfiles.git] / .bash_profile
index 0b6071af2484c55173a9f5db776e69a603f6b8b9..1122b044fafcea72179f4ffbd15080410a078b06 100644 (file)
@@ -11,14 +11,12 @@ if [ "$UNAME" = "Cygwin" ]; then
 fi
 
 # keychain
-keychain="$(type -P keychain)"
-test -n "$keychain" && {
+keychain=$(type -P keychain)
+test -n "$keychain" && \
+  test -z "$SUDO_USER" && {
   if [ -f ~/.ssh/id_rsa ]; then
     eval `$keychain -q ~/.ssh/id_rsa`
     source ~/.keychain/`hostname`-sh > /dev/null
   fi
 }
 unset keychain
-
-# Load RVM function
-[[ -s "$HOME/.rvm/scripts/rvm" ]] && . "$HOME/.rvm/scripts/rvm"