rvm 0.0.80 → 0.0.81

data/scripts/rvm

@@ -6,36 +6,22 @@
 # http://gitub.com/wayneeseguin/rvm
 #
 
-if [[ -f "/etc/rvmrc" ]] ; then source "/etc/rvmrc" ; fi
+if [[ -f /etc/rvmrc ]] ; then source /etc/rvmrc ; fi
+if [[ -f "$HOME/.rvmrc" ]] ; then source "$HOME/.rvmrc" ; fi
+if [[ -z "$rvm_path" ]] ; then unset rvm_path ; fi
 
 if [[ "root" = "$(whoami)" ]] ; then
-  rvm_prefix_path="${rvm_prefix_path:-/usr/local/}"
+  rvm_path="${rvm_path:-/usr/local/rvm}"
 else
-  if [[ -f "$HOME/.rvmrc" ]] ; then source "$HOME/.rvmrc" ; fi
-  if [[ -f "$HOME/.rvm/scripts/rvm" ]] ; then
-    rvm_prefix_path="${rvm_prefix_path:-"$HOME/."}"
-  elif [[ -f "/usr/local/rvm/scripts/rvm" ]] ; then
-    rvm_scripts_path="${rvm_scripts_path:-"/usr/local/rvm"}"
-    rvm_prefix_path="${rvm_prefix_path:-"$HOME/."}"
-  else
-    echo -e "\nERROR: rvm scripts directory was not found in either ~/.rvm/ or /usr/local/rvm\n"
-    if [[ $# -gt 0 ]] ; then exit 0 ; else return 1 ; fi
-  fi
+  rvm_path="${rvm_path:-$HOME/.rvm}"
 fi
 
-if [[ "${rvm_prefix_path#${rvm_prefix_path%?}}" = '.' ]] || [[ "${rvm_prefix_path#${rvm_prefix_path%?}}" = '/' ]] ; then
-  rvm_path="${rvm_prefix_path}rvm"
-else
-  rvm_path="${rvm_prefix_path}/rvm"
-fi
-
-rvm_scripts_path="${rvm_scripts_path:-$rvm_path}"
-source $rvm_scripts_path/scripts/color
-source $rvm_scripts_path/scripts/utility
-source $rvm_scripts_path/scripts/selector
-source $rvm_scripts_path/scripts/ruby-installer # TODO: Script not function.
-source $rvm_scripts_path/scripts/cli
-source $rvm_scripts_path/scripts/gems
+source $rvm_path/scripts/initialize
+source $rvm_path/scripts/utility
+source $rvm_path/scripts/selector
+source $rvm_path/scripts/ruby-installer # TODO: Script not function.
+source $rvm_path/scripts/cli
+source $rvm_path/scripts/gems
 
 rvm_loaded_flag=1 ; export rvm_loaded_flag
 
@@ -45,9 +31,9 @@ alias rvm-restart="source \"${rvm_path}/scripts/rvm\""
 
 if [[ -f "$rvm_path/default" ]] ; then source "$rvm_path/default" ; fi
 
-# Ok now we determine if we were called or sourced... under assumption of course ;)
-if [[ $# -gt 0 ]] && [[ -z "$(echo "$*" | awk '/completion-/')" ]] ; then rvm "$*" ; fi
-
 # Source a .rvmrc file in a directory after changing to it, if it exists.
 cd() { builtin cd "$@" ; if [[ -f .rvmrc ]] ; then source .rvmrc ; fi ; }
 
+# Ok now we determine if we were called or sourced... under assumption of course ;)
+if [[ $# -gt 0 ]] && [[ -z "$(echo "$*" | awk '/completion-/')" ]] ; then rvm "$*" ; fi
+

data/scripts/rvm-install

@@ -1,15 +1,19 @@
 #!/usr/bin/env bash
 
-rc_files="$HOME/.bash_profile $HOME/.bashrc $HOME/.zshrc"
-if [[ -f "/etc/rvmrc" ]] ; then source "/etc/rvmrc" ; fi
-if [[ "root" = "$(whoami)" ]] ; then
-  rvm_path="${rvm_path:-/usr/local/rvm}"
-  rc_files="$rc_files /etc/profile /etc/zshenv"
-else
-  if [[ -f "$HOME/.rvmrc" ]] ; then source "$HOME/.rvmrc" ; fi
-  rvm_path="${rvm_path:-$HOME/.rvm}"
+if [[ -f /etc/rvmrc ]] ; then source /etc/rvmrc ; fi
+if [[ -f "$HOME/.rvmrc" ]] ; then source "$HOME/.rvmrc" ; fi
+if [[ -z "$rvm_path" ]] ; then unset rvm_path ; fi
+
+if [[ -z "$rvm_path" ]] ; then
+  if [[ "root" = "$(whoami)" ]] ; then
+    rvm_path="${rvm_path:-/usr/local/rvm}"
+  else
+    rvm_path="${rvm_path:-$HOME/.rvm}"
+  fi
 fi
 
+source scripts/initialize
+
 #
 # Setup
 #
@@ -21,8 +25,8 @@ if [[ ! -d "$source_dir" ]] ; then unset source_dir ; fi
 source_dir="${source_dir:-$cwd}"
 
 # State what is required to use rvm
-echo -e "\n$(tput setaf 2)rvm$(tput sgr0)\n\n    shell scripts that allows a user to manage multiple ruby versions in their own account."
-echo -e "\n    Installing rvm to $rvm_path ..."
+echo -e "\n$(tput setaf 2)rvm$(tput sgr0) - shell scripts that allows a user to manage multiple ruby versions in their own account."
+echo -e "\n    Installing to $rvm_path..."
 for dir_name in src scripts bin log archives config gems examples ; do
   mkdir -p "$rvm_path/$dir_name"
 done
@@ -47,15 +51,15 @@ ln -nfs $rvm_path/scripts/rvm $rvm_path/bin/rvm
 #
 # RC Files
 #
-if [[ -z "$rvm_loaded_flag" ]] ; then
-  for rcfile in $(echo $rc_files) ; do
-    if [[ ! -f $rcfile ]] ; then touch $rcfile ; fi
-    if [[ -z "$(awk '/\.rvm\/scripts\/rvm/' $rcfile)" ]] ; then
-      echo "    Adding 'if [[ -s $rvm_path/scripts/rvm ]] ; then source $rvm_path/scripts/rvm ; fi' to $rcfile."
-      echo -e "\n# rvm-install added line:\nif [[ -s $rvm_path/scripts/rvm ]] ; then source $rvm_path/scripts/rvm ; fi\n" >> $rcfile
-    fi
-  done
-fi
+for rcfile in $(echo $rvm_rc_files) ; do
+  if [[ ! -f $rcfile ]] ; then touch $rcfile ; fi
+  if [[ -z "$(awk "/$(echo "$rvm_path/scripts/rvm" | sed 's#/#\\/#g')/" $rcfile)" ]] ; then
+    echo "    Adding 'if [[ -s $rvm_path/scripts/rvm ]] && [[ "\$rvm_loaded_flag" -le 0 ]] ; then source $rvm_path/scripts/rvm ; fi' to $rcfile."
+    echo -e "\n# rvm-install added line:\nif [[ -s $rvm_path/scripts/rvm ]] && [[ "\$rvm_loaded_flag" != "1" ]] ; then source $rvm_path/scripts/rvm ; fi\n" >> $rcfile
+  else
+    : # it exists... remove it and append at the end
+  fi
+done
 
 if [[ "root" = "$(whoami)" ]] ; then
   ln -nfs $rvm_path/scripts/rvm /usr/local/bin/rvm
@@ -66,7 +70,7 @@ fi
 # System Checks
 #
 system="$(uname)"
-echo -e "\n    $(tput setaf 3)NOTES: $(tput sgr0)\n"
+echo -e "\n$(tput setaf 2)Notes: $(tput sgr0)\n"
 if [[ "Linux" = "$system" ]] ; then
   rvm_apt_get_binary="$(which aptitude 2> /dev/null)"
   rvm_emerge_binary="$(which emerge 2> /dev/null)"
@@ -74,44 +78,42 @@ if [[ "Linux" = "$system" ]] ; then
   rvm_yum_binary="$(which yum 2> /dev/null)"
 
   if [[ ! -z "$rvm_apt_get_binary" ]] ; then
-    echo -e "      $item For jRuby (if you wish to use it) you will need:"
-    echo -e "        $ aptitude install sun-java6-bin sun-java6-jre sun-java6-jdk"
-    echo -e "      $item For ree (if you wish to use it) you will need:"
-    echo -e "        $ aptitude install libreadline5-dev libssl-dev bison"
-    echo -e "      $item For 1.9.X (if you wish to use it) we additionally recommend:"
-    echo -e "        $ aptitude install libxml2-dev"
+    echo -e "    $item For JRuby (if you wish to use it) you will need:"
+    echo -e "      $ aptitude install sun-java6-bin sun-java6-jre sun-java6-jdk"
+    echo -e "    $item For ree (if you wish to use it) you will need:"
+    echo -e "      $ aptitude install libreadline5-dev libssl-dev bison"
+    echo -e "    $item For 1.9.X (if you wish to use it) we additionally recommend:"
+    echo -e "      $ aptitude install libxml2-dev"
 
   elif [[ ! -z "$rvm_emerge_binary" ]] ; then
-    echo -e "      $item For jRuby (if you wish to use it) you will need:"
-    echo -e "        $ emerge dev-java/sun-jdk dev-java/sun-jre-bin"
+    echo -e "    $item For JRuby (if you wish to use it) you will need:"
+    echo -e "      $ emerge dev-java/sun-jdk dev-java/sun-jre-bin"
 
   elif [[ ! -z "$rvm_pacman_binary" ]] ; then
-    echo -e "      $item For jRuby (if you wish to use it) you will need:"
-    echo -e "        $ pacman -Sy jdk jre"
+    echo -e "    $item For JRuby (if you wish to use it) you will need:"
+    echo -e "      $ pacman -Sy jdk jre"
 
   elif [[ ! -z "$rvm_yum_binary" ]] ; then
-    echo -e "      $item For ree (if you wish to use it) you will need:"
-    echo -e "        $ yum install -y rpm-build gcc gcc-c++ redhat-rpm-config ; then download and rpmbuild and install the sdk, Have fun..."
+    echo -e "    $item For ree (if you wish to use it) you will need:"
+    echo -e "      $ yum install -y rpm-build gcc gcc-c++ redhat-rpm-config ; then download and rpmbuild and install the sdk, Have fun..."
 
   else
-    echo -e "      $item For jRuby (if you wish to use it) you will need:"
-    echo -e "        The SUN java runtime environment and development kit."
+    echo -e "    $item For JRuby (if you wish to use it) you will need:"
+    echo -e "      The SUN java runtime environment and development kit."
   fi
 elif [[ "Darwin" = "$system"  ]] ; then
-  echo -e "      $item Be sure that you have XCode Tools installed in order to use rvm."
-  echo -e "      $item If you intend on installing MacRuby you must install LLVM first."
+  echo -e "    $item Be sure that you have XCode Tools installed in order to use rvm."
+  echo -e "    $item If you intend on installing MacRuby you must install LLVM first."
 fi
 
-echo -e "      $item In order to use rvm the following line must occur in your shell's loading files, after all path/variable settings.:"
-echo -e "      $item if [[ -s $rvm_path/scripts/rvm ]] ; then source $rvm_path/scripts/rvm ; fi"
-echo -e "      $item CLOSE THIS SHELL AND OPEN A NEW ONE in order to use rvm."
+echo -e "    $item In order to use rvm the following line must occur in your shell's loading files, after all path/variable settings.:"
+echo -e "    $item if [[ -s $rvm_path/scripts/rvm ]] ; then source $rvm_path/scripts/rvm ; fi"
+echo -e "    $item CLOSE THIS SHELL AND OPEN A NEW ONE in order to use rvm."
 
-echo -e "\n    \033[0;33mRTFM: $(tput sgr0) http://rvm.beginrescueend.com/ \n"
+echo -e "\n$(tput setaf 2)RTFM:\n    $(tput sgr0) http://rvm.beginrescueend.com/ \n"
 echo -e "$(tput setaf 2)w⦿‿⦿t!$(tput sgr0)"
 echo -e "\n    ~ Wayne\n"
 
-source $rvm_path/scripts/rvm
-rvm -v
-echo
+$rvm_path/bin/rvm -v
 
 exit 0

data/scripts/selector

@@ -18,14 +18,14 @@ __rvm_select() {
         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_ruby_repo_url=${rvm_ruby_repo_url:-"$($rvm_scripts_path/db "$rvm_config_path/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_version="${rvm_ruby_version:-"$($rvm_scripts_path/db "$rvm_config_path/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"
@@ -34,7 +34,7 @@ __rvm_select() {
 
         unset rvm_ruby_patch_level
       else
-        __rvm_log "fail" "MacRuby can only be installed on a Darwin OS."
+        $rvm_scripts_path/log "fail" "MacRuby can only be installed on a Darwin OS."
       fi
     ;;
 
@@ -42,7 +42,7 @@ __rvm_select() {
       rvm_ruby_interpreter="rbx"
       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_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_ruby_repo_url
       rvm_ruby_configure=" true "
@@ -55,10 +55,10 @@ __rvm_select() {
       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")}"
+        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")}"
       else
-        rvm_ruby_version="${rvm_ruby_version:-"$(__rvm_db "jruby_version")"}"
+        rvm_ruby_version="${rvm_ruby_version:-"$($rvm_scripts_path/db "$rvm_config_path/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"
@@ -69,7 +69,7 @@ __rvm_select() {
 
     ree)
       rvm_ruby_interpreter=ree
-      rvm_ruby_version=${rvm_ruby_version:-"$(__rvm_db "ree_version")"}
+      rvm_ruby_version=${rvm_ruby_version:-"$($rvm_scripts_path/db "$rvm_config_path/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}"
@@ -83,12 +83,12 @@ __rvm_select() {
           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_db "${rvm_ruby_interpreter}_${rvm_ruby_version}_url")}/$rvm_ruby_package_file.tar.gz"
+          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"
         fi
       fi
 
-      if ! match "$rvm_ruby_version" "^1\.8" ; then
-        __rvm_log "fail" "Unknown Ruby Enterprise Edition version: $rvm_ruby_version"
+      if ! $rvm_scripts_path/match "$rvm_ruby_version" "^1\.8" ; then
+        $rvm_scripts_path/log "fail" "Unknown Ruby Enterprise Edition version: $rvm_ruby_version"
       fi
     ;;
 
@@ -97,19 +97,19 @@ __rvm_select() {
       rvm_ruby_version="head"
       rvm_ruby_string="mput-head"
       unset rvm_ruby_patch_level
-      rvm_ruby_repo_url=${rvm_mput_repo_url:-"$(__rvm_db "shyouhei_repo_url")"}
+      rvm_ruby_repo_url=${rvm_mput_repo_url:-"$($rvm_scripts_path/db "$rvm_config_path/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_db "ruby_repo_url")"}"
-      if [[ -z "$rvm_ruby_version" ]] ; then __rvm_log "fail" "Unknown ruby version: $rvm_ruby_version" ; fi
+      rvm_ruby_repo_url="${rvm_ruby_repo_url:-"$($rvm_scripts_path/db "$rvm_config_path/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)"
-      if match "$ruby_binary" "rvm" ; then
+      if $rvm_scripts_path/match "$ruby_binary" "rvm" ; then
         rvm_ruby_string="$(dirname "$ruby_binary" | xargs dirname | xargs basename)"
       else
         rvm_ruby_interpreter="system"
@@ -126,7 +126,7 @@ __rvm_select() {
         __rvm_select
       else
         if [[ -z "$rvm_ruby_string" ]] ; then
-          __rvm_log "fail" "Ruby implementation '$rvm_ruby_interpreter' is not known."
+          $rvm_scripts_path/log "fail" "Ruby implementation '$rvm_ruby_interpreter' is not known."
         fi
       fi
   esac
@@ -173,11 +173,11 @@ __rvm_use() {
       source $rvm_path/default
 
       if [[ ! -z "$rvm_verbose_flag" ]] ; then
-        __rvm_log "info" "Now using default ruby."
+        $rvm_scripts_path/log "info" "Now using default ruby."
       fi
     else
       rvm_ruby_interpreter="system"
-      __rvm_log "warn" "no default rvm specified, defaulting to pre-rvm system."
+      $rvm_scripts_path/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
@@ -203,31 +203,34 @@ __rvm_use() {
     fi
 
     if [[ ! -z "$rvm_verbose_flag" ]] ; then
-      __rvm_log "info" "Now using system ruby."
+      $rvm_scripts_path/log "info" "Now using system ruby."
     fi
 
     rvm_ruby_string="system"
 
   else
-    GEM_HOME=$rvm_ruby_gem_home ; export GEM_HOME
-    GEM_PATH=$rvm_ruby_gem_home ; export GEM_PATH
-    MY_RUBY_HOME=$rvm_ruby_home ; export MY_RUBY_HOME
-    RUBY_VERSION=$rvm_ruby_string ; export RUBY_VERSION
-    IRBRC="$rvm_ruby_irbrc" ; export IRBRC
+    GEM_HOME=$rvm_ruby_gem_home
+    GEM_PATH=$rvm_ruby_gem_home
+    MY_RUBY_HOME=$rvm_ruby_home
+    RUBY_VERSION=$rvm_ruby_string
+    IRBRC="$rvm_ruby_irbrc"
+
+    export GEM_HOME GEM_PATH MY_RUBY_HOME RUBY_VERSION IRBRC
+
     if [[ -z "$IRBRC" ]] ; then unset IRBRC ; fi
 
     if [[ ! -d $MY_RUBY_HOME ]] ; then
-      __rvm_log "warn" "$rvm_ruby_interpreter $rvm_ruby_string is not installed."
+      $rvm_scripts_path/log "warn" "$rvm_ruby_interpreter $rvm_ruby_string is not installed."
       if [[ ! -z "$rvm_install_on_use_flag" ]] ; then
         __rvm_install_ruby $rvm_ruby_interpreter $rvm_ruby_version $rvm_ruby_patch_level
       else
-        __rvm_log "info" "To install do: 'rvm install $rvm_ruby_string'"
+        $rvm_scripts_path/log "info" "To install do: 'rvm install $rvm_ruby_string'"
         return 1
       fi
     fi
 
     if [[ ! -z "$rvm_verbose_flag" ]] ; then
-      __rvm_log "info" "Now using $(echo $rvm_ruby_string | tr '-' ' ')"
+      $rvm_scripts_path/log "info" "Now using $(echo $rvm_ruby_string | tr '-' ' ')"
     fi
 
     __rvm_irbrc
@@ -240,6 +243,8 @@ __rvm_use() {
       for binary in erb gem irb rake rdoc ri ruby testrb ; do
         rm -f /usr/local/bin/$binary
         ln -nfs $rvm_ruby_home/bin/$binary /usr/local/bin/$binary
+        rm -f /usr/local/bin/passenger_ruby
+        ln -nfs $rvm_bin_path/$rvm_ruby_string /usr/local/bin/passenger_ruby
       done
     fi
   fi
@@ -265,9 +270,10 @@ __rvm_use() {
       done ; unset variable value
 
       if [[ -s "$rvm_path/bin/$rvm_ruby_string" ]] ; then
-        ln -fs "$rvm_path/bin/$rvm_ruby_string" "$rvm_path/bin/default-ruby" # So that people know what it's for :)
-        ln -fs "$rvm_path/$rvm_ruby_string/bin/gem" "$rvm_path/bin/default-gem"
-        ln -fs "$rvm_path/$rvm_ruby_string/bin/irb" "$rvm_path/bin/default-irb"
+        rm -f $rvm_path/bin/default*
+        ln -fs "$rvm_path/bin/$rvm_ruby_string" "$rvm_path/bin/default_ruby" # So that people know what it's for :)
+        ln -fs "$rvm_path/$rvm_ruby_string/bin/gem" "$rvm_path/bin/default_gem"
+        ln -fs "$rvm_path/$rvm_ruby_string/bin/irb" "$rvm_path/bin/default_irb"
       else
         rm -f $rvm_path/bin/default*
       fi
@@ -313,54 +319,60 @@ __rvm_ruby_string() {
       rvm_ruby_version="nightly"
       rvm_nightly_flag=1
       break
-    elif match "$string" "^preview" ; then
+    elif $rvm_scripts_path/match "$string" "^preview" ; then
       rvm_ruby_patch_level="$string"
-    elif match "$string" "^[0-9]\.[0-9]" ; then
+    elif $rvm_scripts_path/match "$string" "^[0-9]\.[0-9]" ; then
       if [[ "1.8" = "$string" ]] ; then string="1.8.6" ; fi
       if [[ "1.9" = "$string" ]] ; then string="1.9.1" ; fi
       rvm_ruby_version="$string"
       unset rvm_ruby_revision rvm_ruby_tag
-    elif match "$string" "^p[0-9]" ; then
+    elif $rvm_scripts_path/match "$string" "^p[0-9]" ; then
       rvm_ruby_patch_level="$string"
-    elif match "$string" "^[0-9][0-9]" ; then
+    elif $rvm_scripts_path/match "$string" "^[0-9][0-9]" ; then
       if [[ "ree" = "$rvm_ruby_interpreter" ]] ; then
         rvm_ruby_patch_level="$string"
         unset rvm_ruby_revision
       else
         rvm_ruby_revision="r$string"
       fi
-    elif match "$string" "^r[0-9]" ; then
+    elif $rvm_scripts_path/match "$string" "^r[0-9]" ; then
       unset rvm_ruby_patch_level
       rvm_ruby_revision="$string"
-    elif match "$string" "^s[0-9]" ; then
+    elif $rvm_scripts_path/match "$string" "^s[0-9]" ; then
       unset rvm_ruby_revision
       rvm_ruby_sha="$string"
-    elif match "$string" "^t[v0-9]" ; then
+    elif $rvm_scripts_path/match "$string" "^t[v0-9]" ; then
       unset rvm_ruby_patch_level rvm_ruby_revision
       rvm_ruby_tag="$string"
-    elif match "$string" "^[a-z][a-z]" ; then
+    elif $rvm_scripts_path/match "$string" "^m[0-9]" ; then
+      rvm_ruby_mode="$string"
+    elif $rvm_scripts_path/match "$string" "^[a-z][a-z]" ; then
       rvm_ruby_interpreter="$string"
     else
-      __rvm_log "error" "Unknown ruby string component: '$string'"
+      $rvm_scripts_path/log "error" "Unknown ruby string component: '$string'"
     fi
   done
 
   # Unspecified interpreter
   if [[ -z "$rvm_ruby_interpreter" ]] ; then
-    if match "$rvm_ruby_version" "^1\.[8-9]" ; then
+    if $rvm_scripts_path/match "$rvm_ruby_version" "^1\.[8-9]" ; then
       rvm_ruby_interpreter="ruby"
-    elif match "$rvm_ruby_version" "^0.5" ; then
+    elif $rvm_scripts_path/match "$rvm_ruby_version" "^0.5" ; then
       rvm_ruby_interpreter="macruby"
-    elif match "$rvm_ruby_version" "^1.[2-4]" ; then
+    elif $rvm_scripts_path/match "$rvm_ruby_version" "^1.[2-4]" ; then
       rvm_ruby_interpreter="jruby"
     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_scripts_path/db "$rvm_config_path/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
-  rvm_ruby_string="${rvm_ruby_interpreter}-${rvm_ruby_version}"
 
   if [[ "$rvm_head_flag" -eq 1 ]] ; then
     rvm_ruby_string="${rvm_ruby_string}-head"
@@ -371,7 +383,7 @@ __rvm_ruby_string() {
   elif [[ ! -z "$rvm_ruby_patch_level" ]]  ; then
     rvm_ruby_string="${rvm_ruby_string}-${rvm_ruby_patch_level}"
   else
-    patch_level="$(__rvm_db "${rvm_ruby_interpreter}_${rvm_ruby_version}_patch_level")"
+    patch_level="$($rvm_scripts_path/db "$rvm_config_path/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#')"