scripts/selector in rvm-0.0.73 vs scripts/selector in rvm-0.0.74
- old
+ new
@@ -1,9 +1,9 @@
#!/bin/bash
# __rvm_select implementation version patch_level
-function __rvm_select {
+__rvm_select() {
if [[ -z "$rvm_ruby_string" ]] ; then
rvm_ruby_string="${rvm_ruby_interpreter}"
if [[ ! -z "$rvm_ruby_version" ]] ; then rvm_ruby_string="$rvm_ruby_string-$rvm_ruby_version" ; fi
if [[ ! -z "$rvm_ruby_patch_level" ]] ; then rvm_ruby_string="$rvm_ruby_string-$rvm_ruby_patch_level" ; fi
if [[ ! -z "$rvm_ruby_revision" ]] ; then rvm_ruby_string="$rvm_ruby_string-$rvm_ruby_revision" ; fi
@@ -43,11 +43,11 @@
rvm_ruby_version="${rvm_ruby_version:-head}"
unset rvm_ruby_patch_level
rvm_ruby_repo_url=${rvm_rbx_repo_url:-"$(__rvm_db "rubinius_repo_url")"}
rvm_ruby_string="rbx-head" # for now :)
rvm_url=$rvm_ruby_repo_url
- rvm_ruby_configure=""
+ rvm_ruby_configure=" true "
rvm_ruby_make="build"
rvm_ruby_make_install=""
;;
jruby)
@@ -151,18 +151,18 @@
rvm_ruby_gem_home="${rvm_gem_path}/${rvm_ruby_interpreter}/${rvm_ruby_version}%${rvm_gem_set_name}"
fi
rvm_ruby_selected_flag=1
- 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_make rvm_ruby_make_install rvm_ruby_revision rvm_ruby_tag rvm_major_version rvm_minor_version rvm_gem_set_name rvm_gem_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_gem_set_name rvm_gem_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_unset_ruby_variables
rvm_ruby_interpreter="system"
fi
}
-function __rvm_use {
+__rvm_use() {
if [[ -z "$rvm_ruby_selected_flag" ]] ; then __rvm_select $* ; fi
if [[ -z "$rvm_ruby_interpreter" ]] ; then rvm_ruby_interpreter="default" ; fi
if [[ "default" = "$rvm_ruby_interpreter" ]] ; then
@@ -340,9 +340,10 @@
rvm_ruby_string="${rvm_ruby_string}-${rvm_ruby_patch_level}"
else
patch_level="$(__rvm_db "${rvm_ruby_interpreter}_${rvm_ruby_version}_patch_level")"
if [[ ! -z "$patch_level" ]] ; then rvm_ruby_patch_level="p${patch_level}" ; fi
if [[ ! -z "$rvm_ruby_patch_level" ]] ; then
+ rvm_ruby_patch_level="$(echo $rvm_ruby_patch_level | sed 's#^pp#p#')"
rvm_ruby_string="${rvm_ruby_string}-${rvm_ruby_patch_level}"
fi
fi
}