scripts/rvm in rvm-0.1.43 vs scripts/rvm in rvm-0.1.44

@@ -2,35 +2,48 @@
 
 # rvm : Ruby enVironment Manager
 # http://rvm.beginrescueend.com
 # http://gitub.com/wayneeseguin/rvm
 
+rvm_reload_flag="${rvm_reload_flag:-0}"
+rvm_loaded_flag="${rvm_loaded_flag:-0}"
 if [[ "$rvm_loaded_flag" != "1" ]] || [[ "$rvm_reload_flag" = "1" ]] ; then
   unset rvm_reload_flag
 
-  for rvmrc in /etc/rvmrc $HOME/.rvmrc ; do
-    if [[ -f "$rvmrc" ]] ; then
-      if grep -q '^\s*rvm .*$' $rvmrc ; then
-        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"
+  if [[ -z "$rvm_ignore_rvmrc" ]]; then
+    for rvmrc in /etc/rvmrc $HOME/.rvmrc ; do
+      if [[ -f "$rvmrc" ]] ; then
+        if grep -q '^\s*rvm .*$' $rvmrc ; then
+          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
+    done
+  fi
+
+  # Set the default sandboxed value.
+  if [[ -z "$rvm_sandboxed" ]]; then
+    if [[ "root" = "$(whoami)" ]] || [[ -n "$rvm_prefix" && "$rvm_prefix" != "$HOME"/* ]]; then
+      rvm_sandboxed=0
+    else
+      rvm_sandboxed=1
     fi
-  done
+  fi
 
   if [[ -z "$rvm_prefix" ]] ; then
-    if [[ "root" = "$(whoami)" ]] ; then
+    if [[ "$rvm_sandboxed" = "0" ]] ; then
       rvm_prefix="/usr/local"
     else
       rvm_prefix="$HOME/."
     fi
   fi
 
   if [[ -z "$rvm_path" ]] ; then
     unset rvm_path
-    if  [[ "root" = "$(whoami)" ]] ; then
+    if  [[ "$rvm_sandboxed" = "0" ]] ; then
       rvm_path="$rvm_prefix/rvm"
     else
       if [[ -d "$HOME/.rvm" ]] && [[ -s "$HOME/.rvm/scripts/rvm" ]]; then
         rvm_path="$HOME/.rvm"
       elif [[ -d "$rvm_prefix/rvm" ]] && [[ -s "$rvm_prefix/rvm/scripts/rvm" ]] ; then
@@ -45,11 +58,11 @@
     if [[ -d "$HOME/.rvm/scripts" ]] && [[ -s "$HOME/.rvm/scripts/rvm" ]]; then
       rvm_scripts_path="$HOME/.rvm/scripts"
     elif [[ -d "$rvm_path/scripts" ]] && [[ -s "$rvm_path/scripts/rvm" ]]; then
       rvm_scripts_path="$rvm_path/scripts"
     else
-      if [[ "root" = "$(whoami)" ]] ; then
+      if [[ "$rvm_sandboxed" = "0" ]] ; then
         rvm_scripts_path="/usr/local/rvm"
       else
         rvm_scripts_path="$HOME/.rvm"
       fi
     fi
@@ -65,10 +78,10 @@
     source $rvm_scripts_path/manpages
     source $rvm_scripts_path/cd
 
     rvm_loaded_flag=1
 
-    rvm_version="$(cat "${rvm_path}/lib/VERSION.yml" | tail -n 3 | sed 's/^.*: //g' | tr "\n" '.' | sed 's/\.$//')" ; export rvm_version
+    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 ! 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"