scripts/selector in rvm-0.0.67 vs scripts/selector in rvm-0.0.68

@@ -41,18 +41,18 @@
     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
-        rvm_ruby_version="1.4.0RC1"
-        rvm_ruby_string="jruby-1.4.0RC1"
+        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_package_file="$rvm_ruby_interpreter-bin-$rvm_ruby_version"
         rvm_ruby_string="${rvm_ruby_interpreter}-${rvm_ruby_version}"
       fi
-      rvm_url="http://dist.codehaus.org/$rvm_ruby_interpreter/$rvm_ruby_version/$rvm_package_file.tar.gz"
+      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)
@@ -93,20 +93,31 @@
     ruby)
       rvm_ruby_repo_url="${rvm_ruby_repo_url:-"$(__rvm_db "ruby_repo_url")"}"
       if [[ -z "$rvm_ruby_version" ]] ; then __rvm_log "fail" "Unknown ruby version: $rvm_ruby_version" ; fi
     ;;
 
-    default|system|current|user)
+    current)
+      ruby_binary="$(which binary)"
+      if match "$ruby_binary" "rvm" ; then
+        rvm_ruby_string="$(dirname "$ruby_binary" | xargs dirname | xargs basename)"
+      else
+        rvm_ruby_interpreter="system"
+      fi
+    ;;
+
+    default|system|user)
       #no-op?
     ;;
 
     *)
       if [[ ! -z "$MY_RUBY_HOME" ]] ; then
         rvm_ruby_string=$(basename $MY_RUBY_HOME)
         __rvm_select
       else
-        __rvm_log "fail" "Ruby implementation '$rvm_ruby_interpreter' is not known."
+        if [[ -z "$rvm_ruby_string" ]] ; then
+          __rvm_log "fail" "Ruby implementation '$rvm_ruby_interpreter' is not known."
+        fi
       fi
   esac
 
   __rvm_gems_select
 
@@ -130,11 +141,12 @@
 
     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
   else
-    rvm_ruby_gem_home="$GEM_HOME"
+    __rvm_unset_ruby_variables
+    rvm_ruby_interpreter="system"
   fi
 }
 
 function __rvm_use {
   if [[ -z "$rvm_ruby_selected_flag" ]] ; then __rvm_select $* ; fi
@@ -147,11 +159,11 @@
 
     if [[ -s $rvm_path/default ]] ; then
       source $rvm_path/default
     else
       rvm_ruby_interpreter="system"
-      __rvm_log "warn" "no default rvm specified, defaulting to pre-rvm sytem."
+      __rvm_log "warn" "no default rvm specified, defaulting to pre-rvm system."
       unset GEM_HOME GEM_PATH MY_RUBY_HOME RUBY_VERSION IRBRC
       if [[ -s $rvm_path/system ]] ; then source $rvm_path/system ; fi
     fi
 
   elif [[ "system" = "$rvm_ruby_interpreter" ]] ; then
@@ -244,11 +256,15 @@
   for string in $(echo $ruby_string | tr '-' ' ') ; do
     if [[ "head" = "$string" ]] ; then
       rvm_ruby_revision="head"
       unset rvm_ruby_patch_level rvm_ruby_revision rvm_ruby_tag
       rvm_head_flag=1
+    elif [[ "default" = "$string" ]] ; then
+      rvm_ruby_interpreter="default"
+      break
     elif [[ "system" = "$string" ]] ; then
+      rvm_ruby_interpreter="system"
       break
     elif match "$string" "^preview" ; then
       rvm_ruby_patch_level="$string"
     elif match "$string" "^[a-z][a-z]" ; then
       rvm_ruby_interpreter="$string"
@@ -267,9 +283,12 @@
         rvm_ruby_revision="r$string"
       fi
     elif match "$string" "^r[0-9]" ; then
       unset rvm_ruby_patch_level
       rvm_ruby_revision="$string"
+    elif match "$string" "^s[0-9]" ; then
+      unset rvm_ruby_revision
+      rvm_ruby_sha="$string"
     elif match "$string" "^t[0-9]" ; then
       unset rvm_ruby_patch_level rvm_ruby_revision
       rvm_ruby_tag="$string"
     else
       __rvm_log "error" "Unknown ruby string component: '$string'"