scripts/selector in rvm-0.0.71 vs scripts/selector in rvm-0.0.72

- old
+ new

@@ -12,23 +12,26 @@ __rvm_ruby_string case "$rvm_ruby_interpreter" in macruby) if [[ "Darwin" = "$(uname)" ]] ; then - rvm_ruby_repo_url="${rvm_ruby_repo_url:-"$(__rvm_db "macruby_repo_url")"}" rvm_ruby_package_name=${rvm_ruby_interpreter}-${rvm_ruby_version} - rvm_ruby_string="${rvm_ruby_interpreter}-${rvm_ruby_version}" - if [[ "nightly" = "$rvm_ruby_version" ]] ; then - rvm_url="http://macruby.icoretech.org/latest" - elif [[ "head" = "$rvm_ruby_version" ]] ; then + if [[ "$rvm_head_flag" -eq 1 ]] ; then + unset rvm_ruby_version rvm_ruby_tag + rvm_ruby_revision="head" rvm_ruby_repo_url=${rvm_ruby_repo_url:-"$(__rvm_db "macruby_repo_url")"} rvm_url="$rvm_ruby_repo_url" + rvm_ruby_string="${rvm_ruby_interpreter}-head" + elif [[ "nightly" = "$rvm_ruby_version" ]] ; then + rvm_url="http://macruby.icoretech.org/latest" + rvm_ruby_string="${rvm_ruby_interpreter}-${rvm_ruby_version}" else rvm_ruby_version="${rvm_ruby_version:-"$(__rvm_db "macruby_version")"}" rvm_ruby_package_name="${rvm_ruby_interpreter}_nightly-${rvm_ruby_version}" rvm_ruby_package_file="MacRuby%200.5%20beta%201.zip" rvm_url="http://www.macruby.org/files/MacRuby%200.5%20beta%201.zip" + rvm_ruby_string="${rvm_ruby_interpreter}-${rvm_ruby_version}" fi unset rvm_ruby_patch_level else __rvm_log "fail" "MacRuby can only be installed on a Darwin OS." @@ -46,22 +49,27 @@ rvm_ruby_make="build" rvm_ruby_make_install="" ;; jruby) - rvm_jruby_repo_url="${rvm_jruby_repo_url:-"git://kenai.com/jruby~main"}" - rvm_ruby_version="${rvm_ruby_version:-"$(__rvm_db "jruby_version")"}" unset rvm_ruby_patch_level - if match "$rvm_ruby_version" "^1.4" ; then + if [[ "$rvm_head_flag" -eq 1 ]] ; then + rvm_ruby_version="head" + rvm_ruby_string="jruby-head" + rvm_ruby_repo_url="${rvm_ruby_repo_url:-$(__rvm_db "jruby_repo_url")}" + rvm_url="${rvm_ruby_repo_url:-$(__rvm_db "jruby_repo_url")}" + elif match "$rvm_ruby_version" "^1.4" ; then + rvm_url="http://jruby.kenai.com/downloads/$rvm_ruby_interpreter/$rvm_ruby_version/$rvm_package_file.tar.gz" rvm_ruby_version="1.4.0RC3" rvm_ruby_string="jruby-1.4.0RC3" rvm_package_file="$rvm_ruby_interpreter-bin-${rvm_ruby_version}" else + rvm_ruby_version="${rvm_ruby_version:-"$(__rvm_db "jruby_version")"}" + rvm_url="http://jruby.kenai.com/downloads/$rvm_ruby_interpreter/$rvm_ruby_version/$rvm_package_file.tar.gz" rvm_package_file="$rvm_ruby_interpreter-bin-$rvm_ruby_version" rvm_ruby_string="${rvm_ruby_interpreter}-${rvm_ruby_version}" fi - rvm_url="http://jruby.kenai.com/downloads/$rvm_ruby_interpreter/$rvm_ruby_version/$rvm_package_file.tar.gz" alias jruby_ng="jruby --ng" alias jruby_ng_server="jruby --ng-server" ;; ree) @@ -320,10 +328,10 @@ fi fi # Unspecified version if [[ -z "$rvm_ruby_version" ]] ; then - rvm_ruby_version=${rvm_ruby_version:-"$(__rvm_db "${rvm_ruby_interpreter}_version")"} + rvm_ruby_version=${rvm_ruby_version:-"$(__rvm_db "${rvm_ruby_interpreter}_version")"} fi rvm_ruby_string="${rvm_ruby_interpreter}-${rvm_ruby_version}" # Unspecified patch level if [[ "$rvm_head_flag" -eq 1 ]] ; then