ruby-installer in rvm-0.0.65

- old
+ new
@@ -178,54 +178,61 @@
         fi
       fi
     ;;
 
     rbx|rubinius)
+      __rvm_log "info" "Installing pre-requisites"
+      # prereqs, 1.8.7 w/ParseTree & rake. Yes this could all be one line... not pushing our luck.
+      echo "$(export rvm_install_on_use_flag=1 ; rvm 1.8.7)" # This should install if missing.
+      # TODO: use 'rvm gems load' here:
+      echo "$(rvm 1.8.7%rbx ; gem install --no-rdoc --no-ri rake ParseTree)" # This should install if missing.
+      __rvm_unset_ruby_variables
+      rvm_ruby_string="rbx-head" ; __rvm_select
+
       unset GEM_HOME GEM_PATH MY_RUBY_HOME IRBRC
       PATH=$(echo $PATH | tr ':' '\n' | awk '$0 !~ /rvm/' | paste -sd : -)
       PATH=$rvm_bin_path:$PATH ; export PATH
 
       rvm_ruby_repo_url=$rvm_rubinius_repo_url
-      rvm_ruby_configure=" "
-      rvm_ruby_src_path=$rvm_ruby_home
-      rvm_ruby_make="rake"
-      rvm_ruby_make_install="rake install"
       rvm_ruby_home="$rvm_path/$rvm_ruby_interpreter-$rvm_ruby_version"
-      #rvm_ruby_revision="head"
 
       # For Installer, can do this once it's ready:
       RBX_PREFIX=$rvm_ruby_home ; export RBX_PREFIX
       # Also see 'rakelib/configuration.rake'
 
-      if [[ ! -d "$rvm_ruby_src_path" ]] || [[ ! -d "$rvm_ruby_src_path/.git" ]] ; then
-        rm -rf $rvm_ruby_src_path
-        __rvm_run "rbx.repo" "git clone --depth 1 $rvm_ruby_repo_url $rvm_ruby_src_path" "Cloning $rvm_ruby_repo_url"
+      if [[ ! -d "$rvm_ruby_home" ]] || [[ ! -d "$rvm_ruby_home/.git" ]] ; then
+        rm -rf $rvm_ruby_home ; cd $rvm_home
+        __rvm_run "rbx.repo" "git clone --depth 1 $rvm_ruby_repo_url $rvm_ruby_home" "Cloning $rvm_ruby_repo_url"
         cd $rvm_ruby_home
       else
         cd $rvm_ruby_home
         __rvm_run "rbx.repo" "git pull origin master" "Pulling from origin master"
       fi
 
-      # prereqs, 1.8.6 w/ParseTree & rake. Yes this could all be one line... not pushing our luck.
-      echo "$(export rvm_install_on_use_flag=1 ; rvm 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.
-      rvm_ruby_interpreter="rbx"
-      __rvm_select
+      #if [[ ! -x "$rvm_ruby_distclean" ]] ; then
+      #  __rvm_run "rake.distclean" "\$(rvm 1.8.7%rbx ; rake distclean --trace)" "Running distclean."
+      #fi
 
+      rvm_ruby_configure="./configure --prefix=$rvm_ruby_home" ; message="Configuring rbx"
       if [[ ! -z "$rvm_jit_flag" ]] ; then
-        __rvm_run "configure" "./configure --prefix=$rvm_ruby_home --enable-llvm" "Configuring rbx with LLVM enabled"
-      else
-        __rvm_run "configure" "./configure --prefix=$rvm_ruby_home" "Configuring rbx"
+        rvm_ruby_configure="$rvm_ruby_configure --enable-llvm" ; message="$message with LLVM enabled"
       fi
+      __rvm_run "configure" "$rvm_ruby_configure" "$message"
 
-      __rvm_run "build" "\$(rvm 1.8.6 -m rbx ; rake build)" "Building rbx"
+      rvm_ruby_make="\$(rvm 1.8.7%rbx ; rake --trace)" ; message="Compiling rbx"
+      __rvm_run "rake" "$rvm_ruby_make" "$message"
 
+      # TODO: Uncomment the following once --prefix is working properly again
+      #rvm_ruby_make_install="\$(rvm 1.8.7%rbx ; rake install --trace)" ; message="Installing rbx"
+      #__rvm_run "rake.install" "$rvm_ruby_make" "$message"
+
       binaries="ruby irb" # Trick to work in more shells :)
       for binary_name in $(echo $binaries) ; do
         ln -fs $rvm_ruby_home/bin/rbx $rvm_ruby_home/bin/$binary_name
       done ; unset binary_name binaries
 
       __rvm_run "rake.install" "$rvm_ruby_home/bin/rbx gem install rake --no-rdoc --no-ri" "Installing Rake"
+
       binary=rake
       if [[ -f $rvm_ruby_gem_home/bin/$binary ]] ; then
         if [[ "$rvm_ruby_gem_home" != "$rvm_ruby_home" ]] ; then
           cp $rvm_ruby_gem_home/bin/$binary $rvm_ruby_home/bin/$binary
         fi