install in rvm-0.1.16 vs install in rvm-0.1.18

@@ -40,17 +40,11 @@
 if [[ -z "$rvm_path" ]] ; then
   unset rvm_path
   if [[ "root" = "$(whoami)" ]] ; then
     rvm_path="/usr/local/rvm"
   else
-    if [[ -d "$HOME/.rvm" ]] && [[ -s "$HOME/.rvm/scripts/rvm" ]]; then
-      rvm_path="$HOME/.rvm"
-    elif [[ -d "/usr/local/rvm" ]] && [[ -s "/usr/local/rvm/scripts/rvm" ]] ; then
-      rvm_path="/usr/local/rvm"
-    else
-      rvm_path="$HOME/.rvm"
-    fi
+    rvm_path="$HOME/.rvm"
   fi
 fi
 
 source scripts/initialize
 __rvm_initialize
@@ -184,8 +178,12 @@
   echo -e "\n2) Ensure that there is no 'return' from inside the .bashrc file. (otherwise rvm will be prevented from working properly)."
   echo -e "\n   This means that if you see '[ -z "$PS1" ] && return' then you must split your .bashrc"
   echo -e "\n   Put everything *except the return code line(s)* into your .bash_profile, and everything above that code in your .bashrc."
   echo -e "\n   If you wish to DRY up your config you can 'source ~/.bashrc' at the top of your .bash_profile."
   echo -e "\n4) Then $(tput setaf 1)CLOSE THIS SHELL$(tput sgr0) and open a new one in order to use rvm.\n"
+fi
+
+if grep '&& return' ~/.bashrc ; then
+  echo -e "\n\nWARNING:  you have a 'return' statement in your .bashrc, likely this will cause untold havoc. Please remove it and refactor your profiles to be correct. If you have questions about this please visit #rvm on irc.freenode.net.\n\n"
 fi
 
 exit 0