scripts/selector in rvm-0.0.84 vs scripts/selector in rvm-0.0.85

@@ -16,18 +16,18 @@
       if [[ "Darwin" = "$(uname)" ]] ; then
         rvm_ruby_package_name=${rvm_ruby_interpreter}-${rvm_ruby_version}
         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_scripts_path/db "$rvm_config_path/db" "macruby_repo_url")"}
+          __rvm_db "macruby_repo_url" "rvm_ruby_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_scripts_path/db "$rvm_config_path/db" "macruby_version")"}"
+          __rvm_db "macruby_version" "rvm_ruby_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
@@ -38,38 +38,38 @@
       fi
     ;;
 
     rbx|rubinius)
       rvm_ruby_interpreter="rbx"
-      rvm_ruby_version=${rvm_ruby_version:-"$($rvm_scripts_path/db "$rvm_config_path/db" "rbx_version")"}
-      rvm_ruby_patch_level=${rvm_ruby_patch_level:-"$($rvm_scripts_path/db "$rvm_config_path/db" "rbx_patch_level")"}
-      rvm_ruby_repo_url=${rvm_rbx_repo_url:-"$($rvm_scripts_path/db "$rvm_config_path/db" "rubinius_repo_url")"}
-      #rvm_ruby_string="rbx-head" # for now :)
-      rvm_url=$($rvm_scripts_path/db "$rvm_config_path/db" "rbx_url")
+      rvm_ruby_version=${rvm_ruby_version:-$(__rvm_db "rbx_version")}
+      rvm_ruby_patch_level=${rvm_ruby_patch_level:-$(__rvm_db "rbx_patch_level")}
+      rvm_ruby_repo_url=${rvm_rbx_repo_url:-$(__rvm_db "rubinius_repo_url")}
+      __rvm_db "rbx_url" "rvm_url"
+
       rvm_ruby_file="rubinius-$rvm_ruby_version-$rvm_ruby_patch_level"
     ;;
 
     jruby)
       unset rvm_ruby_patch_level
       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_scripts_path/db "$rvm_config_path/db" "jruby_repo_url")}"
-        rvm_url="${rvm_ruby_repo_url:-$($rvm_scripts_path/db "$rvm_config_path/db" "jruby_repo_url")}"
+        rvm_ruby_repo_url="${rvm_ruby_repo_url:-$(__rvm_db "jruby_repo_url")}"
+        rvm_url="${rvm_ruby_repo_url:-$(__rvm_db "jruby_repo_url")}"
       else
-        rvm_ruby_version="${rvm_ruby_version:-"$($rvm_scripts_path/db "$rvm_config_path/db" "jruby_version")"}"
+        rvm_ruby_version="${rvm_ruby_version:-"$(__rvm_db "jruby_version")"}"
         rvm_package_file="${rvm_ruby_interpreter}-bin-${rvm_ruby_version}"
         rvm_ruby_string="${rvm_ruby_interpreter}-${rvm_ruby_version}"
         rvm_url="http://jruby.kenai.com/downloads/${rvm_ruby_version}/${rvm_package_file}.tar.gz"
       fi
       alias jruby_ng="jruby --ng"
       alias jruby_ng_server="jruby --ng-server"
     ;;
 
     ree)
       rvm_ruby_interpreter=ree
-      rvm_ruby_version=${rvm_ruby_version:-"$($rvm_scripts_path/db "$rvm_config_path/db" "ree_version")"}
+      rvm_ruby_version=${rvm_ruby_version:-"$(__rvm_db "ree_version")"}
       if [[ ! -z "$rvm_ruby_patch_level" ]] ; then
         rvm_ruby_patch_level="$(echo $rvm_ruby_patch_level | sed 's#^p##')"
         rvm_ruby_string="${rvm_ruby_interpreter}-${rvm_ruby_version}-${rvm_ruby_patch_level}"
       elif [[ "$rvm_head_flag" = 1 ]] ; then
         rvm_ruby_string="${rvm_ruby_interpreter}-${rvm_ruby_version}-head"
@@ -79,11 +79,11 @@
         if [[ ! -z "$rvm_ruby_revision" ]] ; then
           unset rvm_ruby_patch_level rvm_ruby_package_file
           rvm_ruby_package_name="ree-$rvm_ruby_version-$rvm_ruby_revision"
         else
           rvm_ruby_package_file="ruby-enterprise-$rvm_ruby_version-$rvm_ruby_patch_level"
-          rvm_url="${rvm_url:-$($rvm_scripts_path/db "$rvm_config_path/db" "${rvm_ruby_interpreter}_${rvm_ruby_version}_url")}/$rvm_ruby_package_file.tar.gz"
+          rvm_url="${rvm_url:-$(__rvm_db "${rvm_ruby_interpreter}_${rvm_ruby_version}_url")}/$rvm_ruby_package_file.tar.gz"
         fi
       fi
 
       if ! $rvm_scripts_path/match "$rvm_ruby_version" "^1\.8" ; then
         $rvm_scripts_path/log "fail" "Unknown Ruby Enterprise Edition version: $rvm_ruby_version"
@@ -93,17 +93,17 @@
     mput|shyouhei)
       rvm_ruby_interpreter="mput"
       rvm_ruby_version="head"
       rvm_ruby_string="mput-head"
       unset rvm_ruby_patch_level
-      rvm_ruby_repo_url=${rvm_mput_repo_url:-"$($rvm_scripts_path/db "$rvm_config_path/db" "shyouhei_repo_url")"}
+      rvm_ruby_repo_url=${rvm_mput_repo_url:-"$(__rvm_db "shyouhei_repo_url")"}
       rvm_url=$rvm_ruby_repo_url
       unset rvm_ruby_configure rvm_ruby_make rvm_ruby_make_install
     ;;
 
     ruby)
-      rvm_ruby_repo_url="${rvm_ruby_repo_url:-"$($rvm_scripts_path/db "$rvm_config_path/db" "ruby_repo_url")"}"
+      rvm_ruby_repo_url="${rvm_ruby_repo_url:-"$(__rvm_db "ruby_repo_url")"}"
       if [[ -z "$rvm_ruby_version" ]] ; then $rvm_scripts_path/log "fail" "Unknown ruby version: $rvm_ruby_version" ; fi
     ;;
 
     current)
       ruby_binary="$(which binary 2>/dev/null)"
@@ -364,12 +364,13 @@
     fi
   fi
 
   # Unspecified version
   if [[ -z "$rvm_ruby_version" ]] ; then
-    rvm_ruby_version=${rvm_ruby_version:-"$($rvm_scripts_path/db "$rvm_config_path/db" "${rvm_ruby_interpreter}_version")"}
+    rvm_ruby_version=${rvm_ruby_version:-"$(__rvm_db "${rvm_ruby_interpreter}_version")"}
   fi
+
   if [[ -z "$rvm_ruby_version" ]] ; then
     rvm_ruby_string="${rvm_ruby_interpreter}"
   else
     rvm_ruby_string="${rvm_ruby_interpreter}-${rvm_ruby_version}"
   fi
@@ -381,10 +382,10 @@
   elif [[ ! -z "$rvm_ruby_tag" ]]  ; then
     rvm_ruby_string="${rvm_ruby_string}-${rvm_ruby_tag}"
   elif [[ ! -z "$rvm_ruby_patch_level" ]]  ; then
     rvm_ruby_string="${rvm_ruby_string}-${rvm_ruby_patch_level}"
   else
-    patch_level="$($rvm_scripts_path/db "$rvm_config_path/db" "${rvm_ruby_interpreter}_${rvm_ruby_version}_patch_level")"
+    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