Merge branch 'master' of https://github.com/dustinswan/dotfiles

12 years ago · 2b3339f301
parent d6287bae83 431b96aa1d
commit 2b3339f301
1 changed files with 7 additions and 5 deletions
--- a/8
+++ b/8
@ -33,10 +33,12 @@ export PATH=/usr/local/share/npm/bin:$PATH # npm
 export NODE_PATH=/usr/local/lib/node

 # Chruby
+if [[ -e /usr/local/share/chruby ]]; then
    source '/usr/local/share/chruby/chruby.sh'
    source '/usr/local/share/chruby/auto.sh'
+fi
 if [[ -e /usr/share/chruby ]]; then
-    source /usr/local/share/chruby/chruby.sh
-    source /usr/local/share/chruby/auto.sh
-    chruby $(cat ~/.ruby-version)
+    source /usr/share/chruby/chruby.sh
+    source /usr/share/chruby/auto.sh
 fi
+chruby $(cat ~/.ruby-version)