scripts/rvm in rvm-0.0.89 vs scripts/rvm in rvm-0.0.90

@@ -7,18 +7,17 @@
 if [[ "$rvm_loaded_flag" != "1" ]] || [[ "$rvm_reload_flag" = "1" ]] ; then
   unset rvm_reload_flag
 
   if [[ -f /etc/rvmrc ]] ; then source /etc/rvmrc ; fi
   if [[ -f "$HOME/.rvmrc" ]] ; then source "$HOME/.rvmrc" ; fi
-  if [[ -z "$rvm_path" ]] ; then unset rvm_path ; fi
 
-  if [[ "root" = "$(whoami)" ]] ; then
-    rvm_path="${rvm_path:-/usr/local/rvm}"
-  else
-    if [[ -d "$HOME/.rvm" ]] ; then
-      rvm_path="${rvm_path:-$HOME/.rvm}"
+  if [[ -z "$rvm_path" ]] ; then
+    unset rvm_path
+    if [[ "root" = "$(whoami)" ]] ; then
+      rvm_path="/usr/local/rvm"
     else
-      rvm_path="${rvm_path:-/usr/local/rvm}"
+      if [[ -d "$HOME/.rvm" ]] ; then rvm_path="$HOME/.rvm" ; fi
+      if [[ -d "/usr/local/bin/rvm" ]] && [[ -f "/usr/local/bin/rvm" ]] ; then rvm_path="${rvm_path:-"/usr/local/rvm"}" ; fi
     fi
   fi
 
   source $rvm_path/scripts/array
   source $rvm_path/scripts/initialize