scripts/rvm in rvm-0.1.27 vs scripts/rvm in rvm-0.1.29

@@ -7,11 +7,19 @@
 if [[ "$rvm_loaded_flag" != "1" ]] || [[ "$rvm_reload_flag" = "1" ]] ; then
   unset rvm_reload_flag
 
   mkdir -p $HOME/.gem/cache
 
-  if [[ -f /etc/rvmrc ]] ; then source /etc/rvmrc ; fi
-  if [[ -f "$HOME/.rvmrc" ]] ; then source "$HOME/.rvmrc" ; fi
+  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"
+        return 1
+      else
+        source "$rvmrc"
+      fi
+    fi
+  done
 
   if [[ -z "$rvm_prefix" ]] ; then
     if [[ "root" = "$(whoami)" ]] ; then
       rvm_prefix="/usr/local"
     else