ruby-installer in rvm-0.0.78

- old
+ new

@@ -48,11 +48,11 @@
       if [[ ! -z "$rvm_head_flag" ]] || [[  "trunk" = "$rvm_ruby_revision" ]] ; then
         rvm_url="$rvm_ruby_repo_url/trunk"
         rvm_rev=""
       elif [[ ! -z "$rvm_ruby_tag" ]] ; then
         # TODO: Check if tag v is valid
-        rvm_url="$rvm_ruby_repo_url/tags/$rvm_ruby_tag"
+        rvm_url="$rvm_ruby_repo_url/tags/$(echo $rvm_ruby_tag | sed 's/^t//')"
         rvm_rev=""
       else
         rvm_url=$rvm_ruby_repo_url/branches/ruby_1_${rvm_major_version}_${rvm_minor_version}
         rvm_rev="-$rvm_ruby_revision"
       fi
@@ -230,51 +230,56 @@
       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.
+      # prereqs, 1.8.6+ + 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
+      __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_repo_url="$rvm_rubinius_repo_url"
       rvm_ruby_home="$rvm_path/$rvm_ruby_interpreter-$rvm_ruby_version"
 
-      # 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_home" ]] || [[ ! -d "$rvm_ruby_home/.git" ]] ; then
-        rm -rf $rvm_ruby_home ; cd $rvm_home
+        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
+        cd "$rvm_ruby_home"
       else
-        cd $rvm_ruby_home
+        cd "$rvm_ruby_home"
         __rvm_run "rbx.repo" "git pull origin master" "Pulling from origin master"
       fi
 
       #if [[ ! -x "$rvm_ruby_distclean" ]] ; then
-      #  __rvm_run "rake.distclean" "\$(rvm 1.8.7%rbx ; rake distclean --trace)" "Running distclean."
+      #  __rvm_run "rake.distclean" "\$(rvm 1.8.7 ; rake distclean --trace)" "Running distclean."
       #fi
 
-      rvm_ruby_configure="./configure --prefix=$rvm_ruby_home" ; message="Configuring rbx"
+      # For Installer, can do this once it's ready:
+      # RBX_PREFIX="$rvm_ruby_home" ; export RBX_PREFIX
+      # Also see 'rakelib/configuration.rake'
+
+      cd "$rvm_ruby_home"
+      # TODO: Once installer is done add the prefix:
+      #rvm_ruby_configure="./configure --prefix=$rvm_ruby_home" ; message="Configuring rbx"
+      rvm_ruby_configure="./configure" ; message="Configuring rbx"
       if [[ ! -z "$rvm_jit_flag" ]] ; then
         rvm_ruby_configure="$rvm_ruby_configure --enable-llvm" ; message="$message with LLVM enabled"
       fi
       __rvm_run "configure" "$rvm_ruby_configure" "$message"
 
-      rvm_ruby_make="\$(rvm 1.8.7%rbx ; rake --trace)" ; message="Compiling rbx"
+      if [[ "$rvm_trace_flag" -eq 1 ]] ; then
+        rvm_ruby_make="\$(rvm 1.8.7 ; rake --trace)" ; message="Compiling rbx"
+      else
+        rvm_ruby_make="\$(rvm 1.8.7 ; rake)" ; message="Compiling rbx"
+      fi
       __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_ruby_make_install="\$(rvm 1.8.7 ; 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