selector in rvm-0.1.14

- old
+ new

@@ -236,17 +236,17 @@
         $rvm_scripts_path/log "info" "Now using default ruby."
       fi
     else
       rvm_ruby_interpreter="system"
       $rvm_scripts_path/log "warn" "no default rvm specified, defaulting to pre-rvm system."
-      unset GEM_HOME GEM_PATH MY_RUBY_HOME RUBY_VERSION IRBRC
+      unset GEM_HOME GEM_PATH BUNDLE_PATH MY_RUBY_HOME RUBY_VERSION IRBRC
       if [[ -s $rvm_config_path/system ]] ; then source $rvm_config_path/system ; fi
     fi
 
   elif [[ "system" = "$rvm_ruby_interpreter" ]] ; then
 
-    unset GEM_HOME GEM_PATH MY_RUBY_HOME RUBY_VERSION IRBRC
+    unset GEM_HOME GEM_PATH BUNDLE_PATH MY_RUBY_HOME RUBY_VERSION IRBRC
     new_path="$(echo $PATH | tr ':' '\n' | awk '$0 !~ /rvm/' | paste -sd : -)"
     new_path="$rvm_bin_path:$new_path"
     if [[ -s $rvm_config_path/system ]] ; then
       grep "MY_RUBY_HOME='$rvm_rubies_path" "$rvm_config_path/system" > /dev/null
       if [[ $? -eq 0 ]] ; then
@@ -269,15 +269,16 @@
     export rvm_ruby_string="system"
 
   else
     GEM_HOME="$rvm_ruby_gem_home"
     GEM_PATH="$rvm_ruby_gem_path"
+    BUNDLE_PATH="$rvm_ruby_gem_home"
     MY_RUBY_HOME="$rvm_ruby_home"
     RUBY_VERSION="$rvm_ruby_string"
     IRBRC="$rvm_ruby_irbrc"
 
-    export GEM_HOME GEM_PATH MY_RUBY_HOME RUBY_VERSION IRBRC
+    export GEM_HOME GEM_PATH BUNDLE_PATH MY_RUBY_HOME RUBY_VERSION IRBRC
 
     if [[ -z "$IRBRC" ]] ; then unset IRBRC ; fi
 
     if [[ ! -d $MY_RUBY_HOME ]] ; then
       $rvm_scripts_path/log "warn" "$rvm_ruby_interpreter $rvm_ruby_string is not installed."
@@ -310,15 +311,15 @@
     if [[ "system" = "$rvm_ruby_interpreter" ]] ; then
       rm -f $rvm_config_path/default
       rm -f $rvm_bin_path/default*
     else
       RUBY_VERSION="$($rvm_ruby_home/bin/ruby -v | sed 's#^\(.*\) (.*$#\1#')"
-      export GEM_HOME GEM_PATH MY_RUBY_HOME RUBY_VERSION
+      export GEM_HOME GEM_PATH BUNDLE_PATH MY_RUBY_HOME RUBY_VERSION
 
       echo "export PATH=\"$rvm_ruby_home/bin:$rvm_ruby_gem_home/bin:$rvm_ruby_global_gems_path/bin:$rvm_bin_path:\$PATH\"" > $rvm_config_path/default
 
-      for variable in RUBY_VERSION GEM_HOME GEM_PATH MY_RUBY_HOME IRBRC rvm_ruby_string rvm_gem_set_name MAGLEV_HOME ; do
+      for variable in RUBY_VERSION GEM_HOME GEM_PATH BUNDLE_PATH MY_RUBY_HOME IRBRC rvm_ruby_string rvm_gem_set_name MAGLEV_HOME ; do
         eval "export $variable"
         eval value=\$${variable}
         if [[ ! -z "$value" ]] ; then
           echo "export ${variable}='$value'" >> $rvm_config_path/default
         else
@@ -332,9 +333,10 @@
   unset rvm_default_flag
 
   if [[ ! -z "$rvm_symlink_name" ]]   ; then $rvm_scripts_path/symlink "$rvm_symlink_name" ; unset rvm_symlink_name   ; fi
   if [[ ! -z "$rvm_editor_flag" ]]    ; then $rvm_scripts_path/symlink "editor"            ; unset rvm_editor_flag    ; fi
   if [[ ! -z "$rvm_passenger_flag" ]] ; then $rvm_scripts_path/symlink "passenger"         ; unset rvm_passenger_flag ; fi
+  if [[ ! -z "$rvm_rvmrc_flag" ]]     ; then __rvm_set_rvmrc ; fi
   # Export ruby string and gem set name for extrnal scripts to take advantage of them.
   if [[ ! -z "$rvm_ruby_string" ]]    ; then export rvm_ruby_string  ; fi
   if [[ ! -z "$rvm_gem_set_name" ]]   ; then export rvm_gem_set_name ; fi
   if [[ ! -z "$new_path" ]]           ; then export PATH="$new_path" ; unset new_path ; fi
 