scripts/utility in rvm-0.0.97 vs scripts/utility in rvm-0.0.98

- old
+ new

@@ -155,11 +155,11 @@ fi done } __rvm_bin_script() { - if [[ -z "$rvm_ruby_selected_flag" ]] ; then __rvm_select $* ; fi + if [[ -z "$rvm_ruby_selected_flag" ]] ; then __rvm_select ; fi ruby_wrapper=$(cat <<RubyWrapper #!/bin/bash GEM_HOME=$rvm_ruby_gem_home ; export GEM_HOME GEM_PATH=$rvm_ruby_gem_home ; export GEM_PATH @@ -258,11 +258,11 @@ fi done } __rvm_source_dir() { - if [[ -z "$rvm_ruby_selected_flag" ]] ; then __rvm_select $* ; fi + if [[ -z "$rvm_ruby_selected_flag" ]] ; then __rvm_select ; fi if [[ -z "$rvm_ruby_src_path" ]] ; then $rvm_scripts_path/log "fail" "No source directory exists for the default implementation." else echo "$rvm_ruby_src_path" fi @@ -279,11 +279,11 @@ echo -e "(ruby-)1.8.6(-p383)\n(ruby-)1.8.6-head\n(ruby-)1.8.7(-p174)\n(ruby-)1.8.7-head\n(ruby-)1.9.1(-p243)\n(ruby-)1.9.1(-p376)\n(ruby-)1.9.1-head\n(ruby-)1.9.2-preview1" echo -e "jruby-1.2.0\njruby-1.3.0\njruby-1.3.1\njruby(-1.4.0) # the default\njruby-head" echo -e "rbx(-head) # rubinius head, the default rbx \nrbx(-head) --jit (rubinius head with LLVM enabled)" echo -e "ree-1.8.6\nree(-1.8.7) # the default\nree-1.8.6-head\nree-1.8.7-head" echo -e "mput(-head) # shyouhei head, the default mput" - echo -e "ironruby-0.9.3 # (1.0 RC1)" + echo -e "ironruby-0.9.3 # (1.0 RC1)\nironruby-head" if [[ "Darwin" = "$(uname)" ]] ; then echo -e "macruby(-nightly) # the default macruby\nmacruby-head # Build from the macruby git repository" fi else ruby=$(which ruby 2>/dev/null) ; current_ruby="" @@ -679,29 +679,29 @@ if [[ ! -z "$rvm_ruby_gem_home" ]] ; then rvm_gem_set_name=$(echo $rvm_ruby_gem_home | xargs basename | awk -F'%' '{print $2}') fi if [[ ! -z "$rvm_gem_set_name" ]] && ! $rvm_scripts_path/match "$rvm_gem_set_name" "^[0-9]\.[0-9]" ; then - rvm_ruby_gem_home="$rvm_gem_path/$rvm_ruby_interpreter/$rvm_ruby_version%$rvm_gem_set_name" + rvm_ruby_gem_home="$rvm_gem_path/$rvm_ruby_string%$rvm_gem_set_name" else if [[ ! -z "$rvm_ruby_interpreter" ]] && [[ ! -z "$rvm_ruby_version" ]] && [[ "$rvm_ruby_interpreter" != "system" ]] ; then - rvm_ruby_gem_home="$rvm_gem_path/$rvm_ruby_interpreter/$rvm_ruby_version" + rvm_ruby_gem_home="$rvm_gem_path/$rvm_ruby_string" elif [[ -z "$GEM_HOME" ]] && [[ ! -z "$(which gem 2>/dev/null)" ]] ; then rvm_ruby_gem_home=$(gem env gemdir) elif [[ ! -z "$GEM_HOME" ]] ; then rvm_ruby_gem_home="$GEM_HOME" else unset rvm_ruby_gem_home fi fi if [[ -z "$rvm_gem_set_name" ]] ; then unset rvm_gem_set_name ; fi else - rvm_ruby_gem_home="$rvm_gem_path/$rvm_ruby_interpreter/$rvm_ruby_version%$rvm_gem_set_name" + rvm_ruby_gem_home="$rvm_gem_path/$rvm_ruby_string%$rvm_gem_set_name" fi } __rvm_gems_use() { - if [[ -z "$rvm_ruby_selected_flag" ]] ; then __rvm_select $* ; fi + if [[ -z "$rvm_ruby_selected_flag" ]] ; then __rvm_select ; fi if [[ ! -z "$rvm_ruby_gem_home" ]] ; then mkdir -p "$rvm_ruby_gem_home" GEM_HOME="$rvm_ruby_gem_home" ; export GEM_HOME GEM_PATH="$GEM_HOME" ; export GEM_PATH