scripts/selector in rvm-0.1.18 vs scripts/selector in rvm-0.1.19

- old
+ new

@@ -184,11 +184,11 @@ return 1 fi fi esac - __rvm_gems_select + __rvm_gemset_select if [[ ! -z "$rvm_ruby_interpreter" ]] && [[ "system" != "$rvm_ruby_interpreter" ]] && [[ "default" != "$rvm_ruby_interpreter" ]] ; then if [[ ! -z "$rvm_ruby_version" ]] ; then rvm_major_version=$(echo $rvm_ruby_version | awk -F'.' '{ print $2 }') rvm_minor_version=$(echo $rvm_ruby_version | awk -F'.' '{ print $3 }') @@ -205,19 +205,19 @@ if [[ "maglev" = "$rvm_ruby_interpreter" ]] ; then export MAGLEV_HOME="$rvm_ruby_home" export GEMSTONE_GLOBAL_DIR=$MAGLEV_HOME fi - if [[ ! -z "$rvm_gem_set_name" ]] ; then - rvm_ruby_gem_home="${rvm_ruby_gem_home}%${rvm_gem_set_name}" + if [[ ! -z "$rvm_gemset_name" ]] ; then + rvm_ruby_gem_home="${rvm_ruby_gem_home}%${rvm_gemset_name}" fi rvm_ruby_selected_flag=1 mkdir -p $rvm_ruby_log_path - export rvm_ruby_interpreter rvm_ruby_version rvm_ruby_repo_url rvm_ruby_package_name rvm_url rvm_ruby_patch_level rvm_ruby_configure rvm_ruby_configure_flags rvm_ruby_make rvm_ruby_make_install rvm_ruby_revision rvm_ruby_tag rvm_major_version rvm_minor_version rvm_gem_set_name rvm_gems_path rvm_ruby_gem_home rvm_path rvm_src_path rvm_bin_path rvm_ruby_binary rvm_ruby_home rvm_log_path rvm_ruby_log_path rvm_src_path rvm_ruby_src_path rvm_ruby_irbrc rvm_ruby_selected_flag rvm_ruby_string + export rvm_ruby_interpreter rvm_ruby_version rvm_ruby_repo_url rvm_ruby_package_name rvm_url rvm_ruby_patch_level rvm_ruby_configure rvm_ruby_configure_flags rvm_ruby_make rvm_ruby_make_install rvm_ruby_revision rvm_ruby_tag rvm_major_version rvm_minor_version rvm_gemset_name rvm_gems_path rvm_ruby_gem_home rvm_path rvm_src_path rvm_bin_path rvm_ruby_binary rvm_ruby_home rvm_log_path rvm_ruby_log_path rvm_src_path rvm_ruby_src_path rvm_ruby_irbrc rvm_ruby_selected_flag rvm_ruby_string else rvm_ruby_interpreter="${rvm_ruby_interpreter:-system}" fi } @@ -317,11 +317,11 @@ RUBY_VERSION="$($rvm_ruby_home/bin/ruby -v | sed 's#^\(.*\) (.*$#\1#')" 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 BUNDLE_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_gemset_name MAGLEV_HOME ; do eval "export $variable" eval value=\$${variable} if [[ ! -z "$value" ]] ; then echo "export ${variable}='$value'" >> $rvm_config_path/default else @@ -338,11 +338,11 @@ 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 "$rvm_gemset_name" ]] ; then export rvm_gemset_name ; fi if [[ ! -z "$new_path" ]] ; then export PATH="$new_path" ; unset new_path ; fi if [[ "maglev" = "$rvm_ruby_interpreter" ]] ; then export MAGLEV_HOME="$rvm_ruby_home" export GEMSTONE_GLOBAL_DIR=$MAGLEV_HOME @@ -355,20 +355,20 @@ $rvm_scripts_path/hook "after_use" } __rvm_ruby_string() { # rvm_ruby_string may designate any of the following items: - # * rvm_gem_set_name + # * rvm_gemset_name # * rvm_ruby_interpreter # * rvm_ruby_version # * rvm_ruby_patch_level # * rvm_ruby_revision # * rvm_ruby_tag # * rvm_ruby_patch set_name=$(echo "$rvm_ruby_string" | awk -F'%' '{print $2}') - if [[ ! -z "$set_name" ]] ; then rvm_gem_set_name="$set_name" ; fi + if [[ ! -z "$set_name" ]] ; then rvm_gemset_name="$set_name" ; fi ruby_string=$(echo "$rvm_ruby_string" | awk -F'%' '{print $1}') __rvm_unset_ruby_variables for string in $(echo $ruby_string | tr '-' ' ') ; do @@ -376,14 +376,14 @@ rvm_ruby_revision="head" unset rvm_ruby_patch_level rvm_ruby_revision rvm_ruby_tag export rvm_head_flag=1 elif [[ "default" = "$string" ]] ; then rvm_ruby_interpreter="default" - unset rvm_ruby_patch_level rvm_ruby_tag rvm_head_flag rvm_ruby_revision rvm_ruby_version rvm_gem_set_name + unset rvm_ruby_patch_level rvm_ruby_tag rvm_head_flag rvm_ruby_revision rvm_ruby_version rvm_gemset_name return elif [[ "system" = "$string" ]] ; then rvm_ruby_interpreter="system" - unset rvm_ruby_patch_level rvm_ruby_tag rvm_head_flag rvm_ruby_revision rvm_ruby_version rvm_gem_set_name + unset rvm_ruby_patch_level rvm_ruby_tag rvm_head_flag rvm_ruby_revision rvm_ruby_version rvm_gemset_name return elif [[ "nightly" = "$string" ]] ; then rvm_ruby_version="nightly" rvm_nightly_flag=1 break