.vim: Use 'airline' for statusline
[dotfiles.git] / .bash_profile
index 1947c3b0b2291040dde1ddfb955c0bbef8eff580..aa883acff9c74b0776bb28c3a6bb0fc18129ee21 100644 (file)
@@ -7,12 +7,13 @@ fi
 
 # Set mintty color-palette
 if [ "$UNAME" = "Cygwin" ]; then
-  source ~/.mintty/colors/solarized-alt.sh
+  source ~/.mintty/colors/solarized-ansi.sh
 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
@@ -20,5 +21,7 @@ test -n "$keychain" && {
 }
 unset keychain
 
-# Load RVM function
-[[ -s "$HOME/.rvm/scripts/rvm" ]] && . "$HOME/.rvm/scripts/rvm"
+# rbenv
+rbenv=$(type -P rbenv)
+test -n "$rbenv" && eval "$(rbenv init -)"
+unset rbenv