Permalink
Browse files

Merge branch 'master' of github.com:erikj/dotfiles

  • Loading branch information...
2 parents 739e437 + 7517e97 commit ef538b0826e12eaf8afcc733ea33585a26179ad0 @erikj committed May 13, 2012
Showing with 10 additions and 1 deletion.
  1. +10 −1 eol-unix/.bashrc
View
@@ -16,7 +16,16 @@ PS1='$PWD\n[\u@\h]: '
alias ccatalog='cd /usr/local/catalog/catalog_ui'
alias ce2='cd /usr/local/catalog/catalog-maps'
+# This loads RVM into a shell session.
+if [ `uname -n` = 'sferic.eol.ucar.edu' ]; then
+ export rvm_path=/h/eol/ej/.rvm
+ [[ -s "/h/eol/ej/.rvm/scripts/rvm" ]] && source "/h/eol/ej/.rvm/scripts/rvm"
+else
+ [[ -s "/usr/local/rvm/scripts/rvm" ]] && source "/usr/local/rvm/scripts/rvm"
+fi
+
+
+
-[[ -s "/usr/local/rvm/scripts/rvm" ]] && source "/usr/local/rvm/scripts/rvm" # This loads RVM into a shell session.
export EDITOR='emacs'

0 comments on commit ef538b0

Please sign in to comment.