scripts/selector in rvm-1.0.22 vs scripts/selector in rvm-1.0.23

- old
+ new

@@ -2,11 +2,11 @@ # __rvm_select implementation version patch_level __rvm_select() { # Set Variable Defaults - export GEM_HOME GEM_PATH BUNDLE_PATH MY_RUBY_HOME RUBY_VERSION + export GEM_HOME GEM_PATH MY_RUBY_HOME RUBY_VERSION if [[ -z "${rvm_ruby_string:-""}" ]] ; then [[ -n "${rvm_ruby_interpreter:-""}" ]] && rvm_ruby_string="$rvm_ruby_interpreter" [[ -n "${rvm_ruby_version:-""}" ]] && rvm_ruby_string="$rvm_ruby_string-$rvm_ruby_version" [[ -n "${rvm_ruby_patch_level:-""}" ]] && rvm_ruby_string="$rvm_ruby_string-$rvm_ruby_patch_level" @@ -265,11 +265,11 @@ if [[ -z "${rvm_ruby_interpreter:-""}" ]] ; then rvm_ruby_interpreter="system" ; fi if [[ "system" = "$rvm_ruby_interpreter" ]] ; then - unset GEM_HOME GEM_PATH BUNDLE_PATH MY_RUBY_HOME RUBY_VERSION IRBRC + unset GEM_HOME GEM_PATH MY_RUBY_HOME RUBY_VERSION IRBRC new_path="$(__rvm_remove_rvm_from_path ; printf "$PATH"):${rvm_bin_path:-"$rvm_path/bin"}" if [[ -s "$rvm_path/config/system" ]] ; then @@ -307,16 +307,15 @@ export rvm_ruby_string="system" else GEM_HOME="$rvm_ruby_gem_home" GEM_PATH="$rvm_ruby_gem_home:$rvm_ruby_global_gems_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 BUNDLE_PATH MY_RUBY_HOME RUBY_VERSION IRBRC + export GEM_HOME GEM_PATH MY_RUBY_HOME RUBY_VERSION IRBRC IRBRC=${IRBRC:-""} ; if [[ -z "$IRBRC" ]] ; then unset IRBRC ; fi if [[ ! -d "$MY_RUBY_HOME" ]] ; then "$rvm_path/scripts/log" "warn" \ @@ -378,11 +377,11 @@ \rm -f "$rvm_path/environments/default" \rm -rf "$rvm_path/wrappers/default" else RUBY_VERSION="$("$rvm_ruby_home/bin/ruby" -v | sed 's#^\(.*\) (.*$#\1#')" - export GEM_HOME GEM_PATH BUNDLE_PATH MY_RUBY_HOME RUBY_VERSION + export GEM_HOME GEM_PATH MY_RUBY_HOME RUBY_VERSION "$rvm_path/scripts/alias" delete default &> /dev/null "$rvm_path/scripts/alias" create default "$environment_id" >& /dev/null \ln -nfs "$rvm_path/environments/$environment_id" "$rvm_path/environments/default" \ln -nfs "$rvm_path/wrappers/$environment_id" "$rvm_path/wrappers/default" fi @@ -845,14 +844,13 @@ rvm_ruby_gem_home="${GEM_HOME//${rvm_gemset_separator:-"@"}*}${rvm_gemset_separator:-"@"}${rvm_gemset_name}" rvm_ruby_global_gems_path="${rvm_ruby_gem_home%%${rvm_gemset_separator:-"@"}*}${rvm_gemset_separator:-"@"}global" GEM_HOME="$rvm_ruby_gem_home" - BUNDLE_PATH="$rvm_ruby_gem_home" GEM_PATH="$rvm_ruby_gem_home:$rvm_ruby_global_gems_path" - export rvm_ruby_gem_home GEM_HOME BUNDLE_PATH GEM_PATH + export rvm_ruby_gem_home GEM_HOME GEM_PATH __rvm_use # Now ensure the selection takes effect for the environment. fi return 0 @@ -866,14 +864,12 @@ rvm_ruby_global_gems_path="${rvm_ruby_gem_home}${rvm_gemset_separator:-"@"}global" GEM_HOME=$rvm_ruby_gem_home - BUNDLE_PATH="$rvm_ruby_gem_home" - GEM_PATH="$rvm_ruby_gem_home:$rvm_ruby_global_gems_path" - export rvm_ruby_gem_home rvm_ruby_global_gems_path GEM_HOME BUNDLE_PATH GEM_PATH + export rvm_ruby_gem_home rvm_ruby_global_gems_path GEM_HOME GEM_PATH __rvm_use # Now ensure the selection takes effect for the environment. }