rvm 0.0.46 → 0.0.47

data/lib/VERSION.yml

@@ -1,4 +1,4 @@
 ---
 :major: 0
 :minor: 0
-:patch: 46
+:patch: 47

data/rvm.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rvm}
-  s.version = "0.0.46"
+  s.version = "0.0.47"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Wayne E. Seguin"]

data/scripts/rvm-cli

@@ -106,7 +106,7 @@ function __rvm_parse-args {
   while [ $# -gt 0 ] ; do
     rvm_token="$1" ; shift
     case "$rvm_token" in
-      install|uninstall|path|info|setup|version|srcdir|list|symlinks|reset|debug|reload|usage|help|implode|update|readline|iconv|benchmark|bench|use|gemsync)
+      install|uninstall|path|info|setup|version|srcdir|list|reset|debug|reload|usage|help|implode|update|readline|iconv|benchmark|bench|use|gemsync)
         rvm_action=$rvm_token
       ;;
 
@@ -379,7 +379,6 @@ function rvm {
     srcdir)     __rvm_src-dir          ; result=$? ;;
     gemdup)     __rvm_gem-dup          ; result=$? ;;
     list)       __rvm_list             ; result=$? ;;
-    symlinks)   __rvm_symlinks         ; result=$? ;;
     version)    __rvm_version          ; result=$? ;;
     reset)      __rvm_reset            ; result=$? ;;
                 # TODO: how can we use bin_path here for reload, default file?

data/scripts/rvm-ruby-installer

@@ -18,16 +18,16 @@ function __rvm_install_source {
   if [ -z "$rvm_ruby_tag" -a -z "$rvm_ruby_rev" ] ; then
     if [ ! -d $rvm_ruby_src_path ]  ; then
       rvm_url="${rvm_url:-"ftp://ftp.ruby-lang.org/pub/ruby/1.$rvm_major_version/$rvm_ruby_package_name.tar.gz"}"
-      __rvm_log "info" "\tDownloading $rvm_ruby_package_name, this may take a while depending on your connection..."
+      __rvm_log "info" "Downloading $rvm_ruby_package_name, this may take a while depending on your connection..."
       __rvm_fetch $rvm_url
       if [ $? -gt 0 ] ; then result=$? ; return $result ; fi
-      __rvm_log "info" "\tExtracting $rvm_ruby_package_name ..."
+      __rvm_log "info" "Extracting $rvm_ruby_package_name ..."
       mkdir -p $rvm_ruby_src_path # Is this line necessary considering -C below?    v
       __rvm_run "extract" tar xzf $rvm_archives_path/$rvm_ruby_package_name.tar.gz -C $rvm_source_path
       if [ $? -gt 0 ] ; then result=$? ; return $result ; fi
     fi
   else
-    __rvm_log "info" "\tRetrieving Ruby from $rvm_url"
+    __rvm_log "info" "Retrieving Ruby from $rvm_url"
     if [ ! -z "`echo $rvm_url | grep '^git'`" ] ; then
       if [ -d "$rvm_ruby_src_path/.git" ] ; then
         cd $rvm_ruby_src_path
@@ -82,9 +82,9 @@ function __rvm_install_source {
   fi
 
   if [ -s ./Makefile -a -z "$rvm_reconfigure_flag" ] ; then
-    __rvm_log "warn" "\tSkipping configure step, Makefile exists so configure must have already been run."
+    __rvm_log "warn" "Skipping configure step, Makefile exists so configure must have already been run."
   elif [ -s ./configure ] ; then
-    __rvm_log "info" "\tConfiguring $rvm_ruby_package_name using $rvm_ruby_configure, this may take a while depending on your cpu(s)..."
+    __rvm_log "info" "Configuring $rvm_ruby_package_name using $rvm_ruby_configure, this may take a while depending on your cpu(s)..."
     if [ -d $rvm_path/usr/include/readline/ ] ; then
       configure_parameters="$configure_parameters --with-readline-dir=$rvm_path/usr/include/readline/"
     fi
@@ -95,10 +95,10 @@ function __rvm_install_source {
     unset configure_parameters
     if [ $? -gt 0 ] ; then result=$? ; return $result ; fi
   else
-    __rvm_log "error" "\tSkipping configure step, 'configure' script does not exist, did autoconf not run successfully?"
+    __rvm_log "error" "Skipping configure step, 'configure' script does not exist, did autoconf not run successfully?"
   fi
 
-  __rvm_log "info" "\tCompiling $rvm_ruby_package_name, this may take a while, depending on your cpu(s)..."
+  __rvm_log "info" "Compiling $rvm_ruby_package_name, this may take a while, depending on your cpu(s)..."
   if [ -z "$rvm_ruby_make" ] ; then
     __rvm_run "make" make $rvm_make_flags
   else
@@ -107,7 +107,7 @@ function __rvm_install_source {
   if [ $? -gt 0 ] ; then result=$? ; return $result ; fi
 
   if [ -z "$rvm_ruby_make" ] ; then
-    __rvm_log "info" "\tInstalling $rvm_ruby_package_name"
+    __rvm_log "info" "Installing $rvm_ruby_package_name"
     __rvm_run "install" make install
   else
     __rvm_run "install" $rvm_ruby_make_install
@@ -201,16 +201,16 @@ function __rvm_install_ruby {
       if [ -d $rvm_ruby_src_path ]  ; then
         cd $rvm_ruby_src_path
       else
-        __rvm_log "info" "\tDownloading $rvm_ruby_package_name, this may take a while depending on your connection..."
+        __rvm_log "info" "Downloading $rvm_ruby_package_name, this may take a while depending on your connection..."
         __rvm_fetch $rvm_url
         if [ $? -gt 0 ] ; then result=$? ; return $result ; fi
-        __rvm_log "info" "\tExtracting $rvm_ruby_package_name..."
+        __rvm_log "info" "Extracting $rvm_ruby_package_name..."
         mkdir -p $rvm_ruby_src_path
         __rvm_run "extract" tar xzf $rvm_archives_path/$rvm_ruby_package_name.tar.gz -C $rvm_source_path
         if [ $? -gt 0 ] ; then result=$? ; return $result ; fi
       fi
 
-      __rvm_log "info" "\tInstalling $rvm_ruby_package_name, this may take a while, depending on your cpu(s)..."
+      __rvm_log "info" "Installing $rvm_ruby_package_name, this may take a while, depending on your cpu(s)..."
       mkdir -p $rvm_ruby_log_path
 
       cd $rvm_ruby_src_path
@@ -253,15 +253,14 @@ function __rvm_install_ruby {
       cd $rvm_ruby_home
 
       # prereqs, 1.8.6 w/ParseTree & rake. Yes this could all be one line... not pushing our luck.
-      bash -l -c 'rvm 1.8.6 --debug --install' # This should install if missing.
-      bash -l -c 'rvm 1.8.6 -m rbx ; $rvm_ruby_home/bin/gem install --no-rdoc --no-ri rake ParseTree' # This should install if missing.
+      echo `rvm install 1.8.6` # This should install if missing.
+      echo `rvm 1.8.6 -m rbx ; gem install --no-rdoc --no-ri rake ParseTree` # This should install if missing.
       rake186rbx=`rvm 1.8.6 -m rbx ; which rake`
       if [ ! -z "$rvm_jit_flag" ]; then
         __rvm_run "build" RBX_LLVM=1 $rake186rbx build
       else
         __rvm_run "build" $rake186rbx build
-      fi
-      unset rake186rbx
+      fi ; unset rake186rbx
 
       for binary in ruby irb ; do
         ln -fs $rvm_ruby_home/bin/rbx $rvm_ruby_home/bin/$binary
@@ -302,6 +301,7 @@ RubyWrapper
       if [ ! -z "$rvm_ruby_rev" ] ; then
         if [ ! -d $rvm_path/$rvm_ruby_interpreter-$rvm_ruby_version -o ! -d $rvm_path/$rvm_ruby_interpreter-$rvm_ruby_version/.git ] ; then
           git clone --depth 1 $rvm_jruby_repo_url $rvm_ruby_src_path
+          # TODO: Test if 'ant' is installed, if not throw error.
           cd $rvm_ruby_src_path && ant
         fi
       else
@@ -309,15 +309,15 @@ RubyWrapper
           cd $rvm_ruby_src_path
         else
           if [ -z "$rvm_force_flag" -a -f $rvm_package_file -a -s $rvm_package_file ] ; then
-            __rvm_log "info" "\tIt appears that $rvm_package_file has already been downloaded, skipping. Use --force to force re-download."
+            __rvm_log "info" "It appears that $rvm_package_file has already been downloaded, skipping. Use --force to force re-download."
           else
-            __rvm_log "info" "\tDownloading $rvm_package_file, this may take a while depending on your connection..."
+            __rvm_log "info" "Downloading $rvm_package_file, this may take a while depending on your connection..."
             __rvm_fetch $rvm_url
           fi
-          __rvm_log "info" "\tExtracting $rvm_package_file..."
+          __rvm_log "info" "Extracting $rvm_package_file..."
           rvm_unzip=`which unzip`
           if [ $? -ne 0 ] ; then
-            __rvm_log "error" "\t'unzip' was not found in your PATH. jRuby official release comes as a .zip file, hence 'unzip' is required to extract it. Please install 'unzip' and try again."
+            __rvm_log "error" "'unzip' was not found in your PATH. jRuby official release comes as a .zip file, hence 'unzip' is required to extract it. Please install 'unzip' and try again."
           else
             __rvm_run "extract" unzip -q $rvm_archives_path/$rvm_package_file.zip -d $rvm_source_path
           fi
@@ -325,24 +325,35 @@ RubyWrapper
         fi
       fi
 
-      __rvm_log "info" "\tInstalling $rvm_ruby_package_name..."
+      __rvm_log "info" "Installing $rvm_ruby_package_name..."
       mkdir -p $rvm_ruby_home/bin/
       __rvm_run "sync" rsync -ag $rvm_ruby_src_path/ $rvm_ruby_home/
-      __rvm_run "nailgun" cd $rvm_ruby_src_path/tool/nailgun && make $rvm_make_flags
+      __rvm_run "nailgun" "cd $rvm_ruby_src_path/tool/nailgun && make $rvm_make_flags"
       __rvm_pushpop
       chmod +x $rvm_ruby_home/bin/*
-      for binary in jruby jgem jirb ; do
+
+
+      for binary in jirb jruby jgem ; do
         ln -fs $rvm_ruby_home/bin/$binary $rvm_ruby_home/bin/${binary#j}
-      done
+      done ; unset binary
+
+      for binary in rake rdoc ri spec autospec ; do
+        __rvm_inject_ruby_shebang $rvm_ruby_home/bin/$binary
+        __rvm_inject_gem_env $rvm_ruby_home/bin/$binary
+        chmod +x $rvm_ruby_home/bin/$binary
+      done ; unset binary
 
       __rvm_irbrc
-      __rvm_bin_scripts
+      __rvm_bin_script
+
+      ln -fs $rvm_ruby_home/bin/ruby $rvm_path/bin/$rvm_ruby_package_name # Is this necessary?
 
-      ln -fs $rvm_ruby_home/bin/ruby $rvm_path/bin/$rvm_ruby_package_name
+      __rvm_use
       for rvm_gem_name in jruby-openssl ; do
         __rvm_log "info" "Installing $rvm_gem_name"
-        __rvm_run "gems" $rvm_ruby_home/bin/gem install $rvm_gem_name --no-rdoc --no-ri -q
-      done
+        __rvm_run "gems" gem install $rvm_gem_name --no-rdoc --no-ri -q
+      done ; unset rvm_gem_name
+
     ;;
 
     ruby)
@@ -414,23 +425,18 @@ function __rvm_post_install {
       elif [ -f "$rvm_gem_home/bin/$binary" ] ; then
         cp -f $rvm_gem_home/bin/$binary $rvm_ruby_home/bin/$binary
       fi
-      if [ -f $rvm_ruby_home/bin/$binary ] ; then
-        string="ENV['GEM_HOME']=ENV['GEM_HOME'] || '$rvm_gem_home'\nENV['GEM_PATH']=ENV['GEM_PATH'] || '$rvm_gem_home'\nENV['PATH']='$rvm_ruby_home/bin:$rvm_gem_home/bin:' + ENV['PATH']"
-        awk "NR==2 {print \"$string\"} {print}" $rvm_ruby_home/bin/$binary > $rvm_ruby_home/bin/$binary.new
-        mv $rvm_ruby_home/bin/$binary.new $rvm_ruby_home/bin/$binary
-      else
-        __rvm_log "info" "Skipping $rvm_ruby_src_path/bin/$binary, it is an executable not a script."
-      fi
+      __rvm_inject_gem_env $rvm_ruby_home/bin/$binary
+      __rvm_inject_ruby_shebang $rvm_ruby_home/bin/$binary
       chmod +x $rvm_ruby_home/bin/$binary
     fi
-  done
+  done ; unset binary
 
   __rvm_log "info" "Installing gems for $rvm_ruby_package_name."
 
   for rvm_gem_name in rake ; do
     __rvm_log "info" "Installing $rvm_gem_name"
     __rvm_run "gems" $rvm_ruby_home/bin/gem install $rvm_gem_name --no-rdoc --no-ri -q
-  done
+  done ; unset rvm_gem_name
 
   __rvm_log "info" "Installation of gems for $rvm_ruby_package_name is complete."
 
@@ -439,14 +445,14 @@ function __rvm_post_install {
     if [ "$rvm_gem_home" != "$rvm_ruby_home" ] ; then
       cp $rvm_gem_home/bin/$binary $rvm_ruby_home/bin/$binary
     fi
+    __rvm_inject_ruby_shebang "$rvm_ruby_home/bin/$binary"
     __rvm_inject_gem_env "$rvm_ruby_home/bin/$binary"
-  fi
-  unset binary
+  fi ; unset binary
 }
 
 function __rvm_rubygems_setup {
   if [ -z "`echo $rvm_ruby_version | awk '/^1\.9/'`" ] ; then
-    __rvm_log "info" "\tInstalling rubygems dedicated to $rvm_ruby_package_name..."
+    __rvm_log "info" "Installing rubygems dedicated to $rvm_ruby_package_name..."
     rvm_gem_package_name="rubygems-1.3.5"
     rvm_gem_url="http://rubyforge.org/frs/download.php/60718/$rvm_gem_package_name.tgz"
     if [ -d $rvm_source_path/$rvm_gem_package_name ]  ; then
@@ -473,17 +479,33 @@ function __rvm_rubygems_setup {
 }
 
 function __rvm_inject_ruby_shebang {
-  if [ -f $1 ] ; then
-    cat $1 | sed -e "s=#!/usr/bin/env ruby=#!$rvm_ruby_home/bin/ruby=" > $1.new
-    mv $1.new $1 ; chmod +x $1
-  fi
+  __rvm_actual_file $1
+  if [ -f $actual_file ] ; then
+    sed -i.orig -e "s=#\!/usr/bin/env [j]*ruby=#\!$rvm_ruby_home/bin/ruby=" $actual_file
+    rm -f $actual_file.orig ; chmod +x $actual_file
+  fi ; unset actual_file
 }
 
 function __rvm_inject_gem_env {
-  if [ -f $1 ] ; then
-    string="ENV['GEM_HOME']=ENV['GEM_HOME'] || '$rvm_gem_home'\nENV['GEM_PATH']=ENV['GEM_PATH'] || '$rvm_gem_home'\nENV['PATH']='$rvm_ruby_home/bin:$rvm_gem_home/bin:' + ENV['PATH']"
-    awk "NR==2 {print \"$string\"} {print}" $1 > $1.new
-    mv $1.new $1 ; chmod +x $1
+  __rvm_actual_file $1
+  if [ -f $actual_file ] ; then
+    set -x
+    if [ ! -z "`head -n 1 $actual_file | awk '/[j]*ruby/'`" ] ; then
+      string="ENV['GEM_HOME']=ENV['GEM_HOME'] || '$rvm_gem_home'\nENV['GEM_PATH']=ENV['GEM_PATH'] || '$rvm_gem_home'\nENV['PATH']='$rvm_ruby_home/bin:$rvm_gem_home/bin:' + ENV['PATH']"
+    elif [ ! -z "`head -n 1 $actual_file | awk '/bash/'`" ] ; then
+      string="GEM_HOME=\${GEM_HOME:-'$rvm_gem_home'}\nGEM_PATH=\${GEM_PATH:-'$rvm_gem_home'}\nPATH=$rvm_ruby_home/bin:$rvm_gem_home/bin:\$PATH"
+    fi
+    set +x
+    awk "NR==2 {print \"$string\"} {print}" $actual_file > $actual_file.new
+    mv $actual_file.new $actual_file ; chmod +x $actual_file
+  fi ; unset string actual_file
+}
+
+function __rvm_actual_file {
+  if [ -L $1 ] ; then         # If the file is a symlink,
+    actual_file=`readlink $1` # read the link target so we can preserve it.
+  else
+    actual_file="$1"
   fi
 }
 

data/scripts/rvm-selector

@@ -2,17 +2,16 @@
 
 # __rvm_select implementation version patch_level
 function __rvm_select {
-
   if [ ! -z "$rvm_ruby_string" ] ; then
     __rvm_ruby_string
   elif [ ! -z "$rvm_ruby_selector" ] ; then
-      if [ ! -z "$(echo $rvm_ruby_selector | awk '/^[0-9]/')" ] ; then
-        rvm_ruby_interpreter="ruby"
-        rvm_ruby_version=$rvm_ruby_selector
-      else
-        rvm_ruby_interpreter="$rvm_ruby_selector"
-        unset rvm_ruby_version
-      fi
+    if [ ! -z "$(echo $rvm_ruby_selector | awk '/^[0-9]/')" ] ; then
+      rvm_ruby_interpreter="ruby"
+      rvm_ruby_version=$rvm_ruby_selector
+    else
+      rvm_ruby_interpreter="$rvm_ruby_selector"
+      unset rvm_ruby_version
+    fi
   elif [ ! -z "$rvm_ruby_interpreter" ] ; then
     if [ ! -z "$(echo $rvm_ruby_interpreter | awk '/^[0-9]/')" ] ; then
       rvm_ruby_version=$rvm_ruby_interpreter
@@ -27,7 +26,6 @@ function __rvm_select {
   if [ "$rvm_ruby_version" = "1.9" ] ; then rvm_ruby_version="1.9.1" ; fi
 
   case "$rvm_ruby_interpreter" in
-
     macruby)
       if [ "`uname`" = "Darwin" ] ; then
         rvm_ruby_repo_url="${rvm_ruby_repo_url:-`__rvm_db "macruby_repo_url"`}"
@@ -64,6 +62,7 @@ function __rvm_select {
     ;;
 
     ruby-enterprise|ree)
+      rvm_ruby_interpreter="ree"
       rvm_ruby_interpreter=`__rvm_db "ree_interpreter"`
       rvm_ruby_version=${rvm_ruby_version:-`__rvm_db "ree_version"`}
       rvm_ruby_patch_level="${3:-`__rvm_db "ree_patch_level"`}"
@@ -146,11 +145,9 @@ function __rvm_select {
   else
     rvm_gem_home=$GEM_HOME
   fi
-
 }
 
 function __rvm_use {
-
   if [ -z "$rvm_selected" ] ; then __rvm_select $* ; fi
   if [ -z "$rvm_ruby_interpreter" ] ; then rvm_ruby_interpreter="default" ; fi
 

data/scripts/rvm-utility

@@ -54,11 +54,11 @@ function __rvm_debug {
 # Logging functions based on level
 function __rvm_log {
   case "$1" in
-    debug) shift ; echo -e "\033[0;35m<debug> \033[0m $* \033[0;35m</debug> \033[0m " ;;
-    info)  shift ; echo -e "\033[0;32m<info> \033[0m $* \033[0;32m</info> \033[0m " ;;
-    warn)  shift ; echo -e "\033[0;33m<warning> \033[0m $* \033[0;33m</warning> \033[0m " ;;
-    error) shift ; echo -e "\033[0;31m<error> \033[0m $* \033[0;31m</error> \033[0m " ;;
-    fail)  shift ; echo -e "\033[0;31m<fail> \033[0m $* \033[0;31m</fail> \033[0m " ; __rvm_pushpop ; return 1 ;;
+    debug) shift ; echo -e "\033[0;35m<debug>\033[0m $* \033[0;35m</debug> \033[0m " ;;
+    info)  shift ; echo -e "\033[0;32m<info>\033[0m $* \033[0;32m</info> \033[0m " ;;
+    warn)  shift ; echo -e "\033[0;33m<warning>\033[0m $* \033[0;33m</warning> \033[0m " ;;
+    error) shift ; echo -e "\033[0;31m<error>\033[0m $* \033[0;31m</error> \033[0m " ;;
+    fail)  shift ; echo -e "\033[0;31m<fail>\033[0m $* \033[0;31m</fail> \033[0m " ; __rvm_pushpop ; return 1 ;;
     *) echo -e "$*"
   esac
 }
@@ -86,7 +86,7 @@ function __rvm_run {
   if [ -z "$rvm_niceness" -o "$rvm_niceness" = "0" ] ; then
     eval "$command" >> $rvm_ruby_log_path/$log_file_name.log 2>> $rvm_ruby_log_path/$log_file_name.error.log
   else
-    eval "nice -n $rvm_niceness /bin/bash -l -c '$command'" >> $rvm_ruby_log_path/$log_file_name.log 2>> $rvm_ruby_log_path/$log_file_name.error.log
+    eval "nice -n $rvm_niceness \`$command\`" >> $rvm_ruby_log_path/$log_file_name.log 2>> $rvm_ruby_log_path/$log_file_name.error.log
   fi
   if [ $? -gt 0 ] ; then __rvm_log "error" "Error running '$command', please check $rvm_ruby_log_path/$log_file_name.error.log" ; __rvm_pushpop ; return 1 ; fi
   unset log_file command
@@ -102,9 +102,7 @@ function __rvm_load-rvmrc {
 }
 
 function __rvm_bin_scripts {
-  # NOTE: This depends on the forthcoming ruby_string select functionality.
-  rvm_ruby_binaries=`/bin/ls $rvm_path/*/bin/ruby 2> /dev/null`
-  for rvm_ruby_binary in $rvm_ruby_binaries ; do
+  for rvm_ruby_binary in `/bin/ls $rvm_path/*/bin/ruby 2> /dev/null` ; do
     if [ -x $rvm_ruby_binary ] ; then
       rvm_ruby_string=`dirname $rvm_ruby_binary | xargs dirname | xargs basename`
       __rvm_select
@@ -344,8 +342,7 @@ function __rvm_list {
       else
         echo -e "   $version : $string"
       fi
-    done
-    unset version
+    done ; unset version
 
     echo -e "\njruby:\n"
     for version in `/bin/ls -l $rvm_path/ 2> /dev/null | awk '/jruby-.*/ { print $NF }'` ; do
@@ -356,8 +353,7 @@ function __rvm_list {
       else
         echo -e "   $version : $string"
       fi
-    done
-    unset version
+    done ; unset version
 
     echo -e "\nree:\n"
     for version in `/bin/ls $rvm_path/ 2> /dev/null | awk '/ruby-enterprise-.*/ { print $NF }'` ; do
@@ -368,7 +364,7 @@ function __rvm_list {
       else
         echo -e "   $version : $string"
       fi
-    done
+    done ; unset version
 
     if [ -f $rvm_path/default -a -s $rvm_path/default ] ; then
       version=`grep '^MY_RUBY_HOME' ~/.rvm/default | awk -F"'" '{print $2}' | xargs basename`
@@ -381,25 +377,22 @@ function __rvm_list {
         else
           echo -e "   $version : $string"
         fi
-      fi
+      fi ; unset version
     fi
 
     echo -e "\nsystem:\n"
-    system_version=`bash -l -c 'rvm system ; ruby -v 2> /dev/null'`
+    system_version=`rvm system ; ruby -v 2> /dev/null`
     if [ ! -z "$system_version" ] ; then
       if [ "$selected" = "1" ] ; then
         echo -e "   $system_version\n"
       else
         echo -e "=> $system_version\n"
       fi
-    fi
-    unset current version selected
+    fi ; unset current version selected
   fi
-
 }
 
 function __rvm_initialize {
-
   rvm_fetch=`which curl`
   if [ $? -ne 0 ] ; then
     rvm_fetch=`which wget`
@@ -522,7 +515,7 @@ function __rvm_ruby_do {
       rvm_command="$rvm_ruby_home/bin/$binary $rvm_ruby_args"
     fi
     echo -e "\n$rvm_ruby_string: $($rvm_ruby_home/bin/$binary -v)"
-    eval $rvm_command
+    eval "$rvm_command"
     result=$?
     if [ $result -eq 0 ]; then
       eval "successes=(${successes[*]} $rvm_ruby_string)"
@@ -550,6 +543,9 @@ function __rvm_do {
       unset rvm_ruby_string
       __rvm_ruby_do
     done
+  elif [ ! -z "$rvm_ruby_interpreter" ] ; then
+      unset rvm_ruby_string rvm_ruby_version
+      __rvm_ruby_do
   else # all
     while read bin_line
     do # Keep this on second line damnit!
@@ -666,8 +662,6 @@ function __rvm_ruby_string {
         fi
       fi
     fi
-
-    if [ "rvm_ruby_interpreter" = "ree" ] ; then rvm_ruby_interpreter="ruby-enterprise" ; fi
   fi
   return 0
 }
@@ -813,3 +807,4 @@ function __rvm_iconv_install {
   __rvm_run "$package.make.install" make install
   __rvm_pushpop
 }
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rvm
 version: !ruby/object:Gem::Version 
-  version: 0.0.46
+  version: 0.0.47
 platform: ruby
 authors: 
 - Wayne E. Seguin