rvm in rvm-0.1.33

- old
+ new

@@ -1,8 +1,8 @@
 #!/usr/bin/env bash
 
-# rvm : Ruby Version Manager
+# rvm : Ruby enVironment Manager
 # http://rvm.beginrescueend.com
 # http://gitub.com/wayneeseguin/rvm
 
 if [[ "$rvm_loaded_flag" != "1" ]] || [[ "$rvm_reload_flag" = "1" ]] ; then
   unset rvm_reload_flag
@@ -10,11 +10,11 @@
   mkdir -p $HOME/.gem/cache
 
   for rvmrc in /etc/rvmrc $HOME/.rvmrc ; do
     if [[ -f "$rvmrc" ]] ; then
       if grep -q '^\s*rvm .*$' $rvmrc ; then
-        echo -e "Error: $rvmrc is for rvm settings only.\nrvm CLI may NOT be called from within $rvmrc. \nSkipping the loading of $rvmrc"
+        printf "\nError: $rvmrc is for rvm settings only.\nrvm CLI may NOT be called from within $rvmrc. \nSkipping the loading of $rvmrc"
         return 1
       else
         source "$rvmrc"
       fi
     fi
@@ -70,17 +70,13 @@
 
     rvm_version="$(cat "${rvm_path}/lib/VERSION.yml" | tail -n 3 | sed 's/^.*: //g' | tr "\n" '.' | sed 's/\.$//')" ; export rvm_version
 
     alias rvm-restart="source '${rvm_path}/scripts/rvm'"
 
-    if [[ -s "$HOME/.rvm/default" ]] ; then
-      source "$HOME/.rvm/default"
-    elif [[ -s "$rvm_config_path/default" ]] ; then
-      source "$rvm_config_path/default"
-    elif [[ -s "$rvm_prefix/rvm/config/default" ]] ; then
-      source "$rvm_prefix/rvm/config/default"
+    if command -v ruby >/dev/null 2>&1 && command -v ruby | grep -v rvm >/dev/null ; then
+     [[ -s "$rvm_environments_path/default" ]] && source "$rvm_environments_path/default"
     fi
   else
-    echo -e "\$rvm_path is not set. rvm cannot load."
+    printf "\n\$rvm_path is not set. rvm cannot load."
   fi
 fi
 