rvm 0.1.27 → 0.1.29

data/scripts/gemsets

@@ -5,7 +5,8 @@ source $rvm_scripts_path/selector
 
 if [[ ! -z "$rvm_trace_flag" ]] ; then set -x ; export rvm_trace_flag ; fi
 rvm_ruby_gem_home="${rvm_ruby_gem_home:-$GEM_HOME}"
-if [[ ! -d "$rvm_ruby_gem_home" ]] && which gem &> /dev/null ; then rvm_ruby_gem_home="$(gem env home)" ; fi
+
+if [[ ! -d "$rvm_ruby_gem_home" ]] && command -v gem > /dev/null 2>&1; then rvm_ruby_gem_home="$(gem env home)" ; fi
 
 trap "if [[ -d $rvm_tmp_path/ ]] && [[ -s $rvm_tmp_path/$$ ]] ; then rm -f $rvm_tmp_path/$$ > /dev/null 2>&1 ; fi ; exit" 0 1 2 3 15
 
@@ -69,12 +70,12 @@ __rvm_gemset_delete() {
 }
 
 __rvm_gemset_empty() {
-  if [[ -z "$rvm_ruby_selected_flag" ]] ; then __rvm_select ; fi
+  if [[ -z "$rvm_ruby_gem_home" ]] ; then __rvm_select ; fi
   gemdir="$rvm_ruby_gem_home"
   if [[ -d "$gemdir" ]] && [[ "$gemdir" != '/' ]] && [[ ! -z "$rvm_force_flag" ]] ; then
     cd $gemdir && rm -rf ./bin/* ./doc/* ./gems/* ./specifications/*
   elif [[ -d "$gemdir" ]] ; then
-    $rvm_scripts_path/log "warn" "Are you SURE you wish to remove the installed gemset for gemset '${rvm_gemset_separator}$rvm_gemset_name' ($gemdir)?"
+    $rvm_scripts_path/log "warn" "Are you SURE you wish to remove the installed gemset for gemset '$(basename $gemdir)' ($gemdir)?"
     echo -n "(anything other than 'yes' will cancel) > "
     read response
     if [[ "yes" = "$response" ]] ; then
@@ -97,14 +98,14 @@ __rvm_gemset_copy() {
   if [[ -z "$destination_ruby" ]] ; then
     $rvm_scripts_path/log "error" "Source and destination must be specified: 'rvm gemset copy X Y'"
   fi
-  source_path="$($rvm_bin_path/rvm $source_ruby gem env gemdir | tail -n 1)"
-  destination_path="$($rvm_bin_path/rvm $destination_ruby gem env gemdir | tail -n 1)"
-
+  source_path="$(rvm $source_ruby gem env gemdir | tail -n 1)"
+  destination_path="$(rvm $destination_ruby gem env gemdir | tail -n 1)"
   if [[ -d "$source_path" ]] ; then
     if [[ ! -d "$destination_path" ]] ; then mkdir -p $destination_path ; fi
     $rvm_scripts_path/log "info" "Copying gemset from $source_ruby to $destination_ruby" ;
     for dir in bin doc gems specifications ; do
-      cp -Rf $source_path/$dir $destination_path/
+      mkdir -p "$destination_path/$dir"
+      cp -Rf "$source_path/$dir" "$destination_path/"
     done
   else
     $rvm_scripts_path/log "error" "Gems directory does not exist for $source_path ($source_path)"
@@ -226,6 +227,7 @@ __rvm_parse_gems_args() {
 # Install a gem
 __rvm_gem_install() {
   # First we parse the gem args to pick apart the pieces.
+
   __rvm_parse_gems_args
 
   # Now we determine if a .gem cache file is already installed
@@ -274,16 +276,18 @@ __rvm_gem_install() {
     if [[ "rvm_make_flags_flag" -eq 1 ]] ; then __rvm_make_flags ; fi
 
     if [[ ! -z "$rvm_ruby_gem_home" ]] && [[ "$rvm_ruby_gem_home" != "$rvm_gems_path" ]] ; then
-      command="GEM_HOME='$rvm_ruby_gem_home' GEM_PATH='$rvm_ruby_gem_home/bin:$rvm_gems_path/${rvm_ruby_string}${rvm_gemset_separator}global/bin' BUNDLE_PATH='${rvm_ruby_gem_home}' ${gem_prefix} gem install --ignore-dependencies $gems_args $rvm_gem_options $gem_postfix $vars"
+      #command="GEM_HOME='$rvm_ruby_gem_home' GEM_PATH='$rvm_ruby_gem_home/bin:$rvm_gems_path/${rvm_ruby_string}${rvm_gemset_separator}global/bin' BUNDLE_PATH='${rvm_ruby_gem_home}' ${gem_prefix} gem install --ignore-dependencies $gems_args $rvm_gem_options $gem_postfix $vars"
+      command="GEM_HOME='$rvm_ruby_gem_home' GEM_PATH='$rvm_ruby_gem_home/bin:$rvm_gems_path/${rvm_ruby_string}${rvm_gemset_separator}global/bin' BUNDLE_PATH='${rvm_ruby_gem_home}' ${gem_prefix} gem install $gems_args $rvm_gem_options $gem_postfix $vars"
     else
+      #--ignore-dependencies
       command="$gem_prefix gem install --ignore-dependencies $gems_args $rvm_gem_options -q $gem $gem_postfix $vars"
     fi
-    __rvm_run "gem.install" "$command" "$gem_name $gem_version is not installed, installing..."
+    __rvm_run "gem.install" "$command" "installing ${gem_name} ${gem_version}..."
     result=$?
     if [[ $result -eq 0 ]] ; then
-      $rvm_scripts_path/log "info" "$gem_name $gem_version installed."
+      $rvm_scripts_path/log "info" "$gem_name $gem_version installed, output logged to:\n$rvm_path/log/$rvm_ruby_string/gem.install.log"
     else
-      $rvm_scripts_path/log "error" "$gem_name $gem_version failed to install, output has been logged to:\n$rvm_path/log/$rvm_ruby_string/gem.install.error.log"
+      $rvm_scripts_path/log "error" "$gem_name $gem_version failed to install, output logged to:\n$rvm_path/log/$rvm_ruby_string/gem.install.error.log"
     fi
   fi ; unset gem gem_prefix gem_name gem_version gem_file_name gem_postfix cache_file gem_file_name gem_string gem_action
 
@@ -307,7 +311,7 @@ __rvm_gemset_gemdir() {
 
 unset GEM_PATH
 
-if [[ -z "$(which gem 2>/dev/null)" ]] ; then
+if ! command -v gem > /dev/null ; then
   $rvm_scripts_path/log "error" "'gem' was not found, cannot perform gem actions (Do you have an RVM ruby selected?)"
   exit 1
 fi

data/scripts/initialize

@@ -14,6 +14,7 @@ rvm_project_rvmrc_default="${rvm_project_rvmrc_default:-0}"
 rvm_archives_path="${rvm_archives_path:-"$rvm_path/archives"}"
 rvm_src_path="${rvm_src_path:-"$rvm_path/src"}"
 rvm_log_path="${rvm_log_path:-"$rvm_path/log"}"
+rvm_docs_path="${rvm_docs_path:-"$rvm_path/docs"}"
 rvm_bin_path="${rvm_bin_path:-"$rvm_path/bin"}"
 rvm_gems_path="${rvm_gems_path:-"$rvm_path/gems"}"
 rvm_gems_cache_path="${rvm_gems_cache_path:-"$rvm_gems_path/cache"}"
@@ -25,5 +26,5 @@ rvm_usr_path="${rvm_usr_path:-"$rvm_path/usr"}"
 rvm_symlink_path="${rvm_symlink_path:-$rvm_prefix/bin}"
 rvm_gemset_separator="${rvm_gemset_separator:-"@"}"
 
-export rvm_path rvm_rubies_path rvm_scripts_path rvm_archives_path rvm_src_path rvm_log_path rvm_bin_path rvm_gems_path rvm_config_path rvm_tmp_path rvm_hooks_path rvm_gems_cache_path rvm_gemset_separator
+export rvm_path rvm_rubies_path rvm_scripts_path rvm_archives_path rvm_src_path rvm_log_path rvm_bin_path rvm_gems_path rvm_config_path rvm_tmp_path rvm_hooks_path rvm_gems_cache_path rvm_gemset_separator rvm_symlink_path
 

data/scripts/install

@@ -29,7 +29,7 @@ spinner() {
   index=$((($spinner_counter % 8)))
   echo -e -n "\r${array[$index]}"
   let "spinner_counter=spinner_counter+1"
-  which perl > /dev/null 2>&1 && perl -e 'sleep 0.5'
+  command -v perl > /dev/null 2>&1 && perl -e 'sleep 0.5'
 }
 
 if echo "$*" | grep -q 'trace' ; then echo "$*" ; env | grep '^rvm_' ; set -x ; fi
@@ -56,6 +56,7 @@ fi
 if [[ -z "$rvm_path" ]] ; then rvm_path="${rvm_prefix}rvm" ; fi
 
 source scripts/initialize
+
 if grep -q 'scripts/rvm' $HOME/.bash* || grep -q 'scripts/rvm' $HOME/.zsh*; then
   if [[ -d "$rvm_path" ]] && [[ -s "${rvm_path}/scripts/rvm" ]] ; then
     export upgrade_flag=1
@@ -102,7 +103,7 @@ fi
 
 spinner
 
-mkdir -p $rvm_archives_path $rvm_src_path $rvm_log_path $rvm_bin_path $rvm_gems_path $rvm_rubies_path $rvm_config_path $rvm_hooks_path $rvm_tmp_path $rvm_symlink_path $HOME/.gem/cache
+mkdir -p $rvm_archives_path $rvm_src_path $rvm_log_path $rvm_bin_path $rvm_gems_path $rvm_rubies_path $rvm_config_path $rvm_hooks_path $rvm_tmp_path
 
 for file in README LICENCE ; do
   spinner
@@ -112,7 +113,7 @@ done
 #
 # Scripts
 #
-for dir_name in config scripts examples lib hooks ; do
+for dir_name in config scripts examples lib hooks help ; do
   spinner
   mkdir -p "$rvm_path/$dir_name"
   if [[ -d "$source_path/$dir_name" ]] ; then
@@ -265,17 +266,28 @@ if [[ "$upgrade_flag" -eq 1 ]] ; then
 else
   if [[ "root" != "$(whoami)" ]] ; then
     echo -e "\n$(tput setaf 1)You must now finish the install manually:$(tput sgr0)"
-    echo -e "\n1) Place the folowing line at the end of your shell's loading files(.bashrc and then .bash_profile for bash and .zshrc for zsh), after all path/variable settings:"
+    echo -e "\n1) Place the folowing line at the end of your shell's loading files(.bashrc or .bash_profile for bash and .zshrc for zsh), after all path/variable settings:"
     echo -e "\n     if [[ -s $rvm_path/scripts/rvm ]] ; then source $rvm_path/scripts/rvm ; fi"
     echo -e "\n2) Ensure that there is no 'return' from inside the .bashrc file. (otherwise rvm will be prevented from working properly)."
-    echo -e "\n   This means that if you see '[ -z "$PS1" ] && return' then you must remove it and split your .bashrc"
-    echo -e "\n   Put everything *except the return code line(s)* into your .bash_profile, and everything above that code in your .bashrc."
-    echo -e "\n   Be *sure* to REMOVE the '&& return' statement line."
+    echo -e "\n   This means that if you see '[ -z "$PS1" ] && return' then you must change this line to:"
+    echo -e "\n   if [[ ! -z "$PS1" ]] ; then"
+    echo -e "\n     ... original content that was below the && return line ..."
+    echo -e "\n   fi # <= be sure to close the if."
+    echo -e "\n   #EOF .bashrc"
+    echo -e "\n   Be absolutely *sure* to REMOVE the '&& return'."
     echo -e "\n   If you wish to DRY up your config you can 'source ~/.bashrc' at the top of your .bash_profile."
-    echo -e "\n4) Then $(tput setaf 1)CLOSE THIS SHELL$(tput sgr0) and open a new one in order to use rvm.\n"
+    echo -e "\n   placing all non-interactive items in the .bashrc"
+    echo -e "\n3) Then $(tput setaf 1)CLOSE THIS SHELL$(tput sgr0) and open a new one in order to use rvm.\n"
   fi
   if [[ -s $HOME/.bashrc ]] && grep '&& return' $HOME/.bashrc ; then
-    echo -e "\n\nWARNING:  you have a 'return' statement in your .bashrc, likely this will cause untold havoc. Please remove it and refactor your profiles to be correct. If you have questions about this please visit #rvm on irc.freenode.net.\n"
+    echo -e "\n\nWARNING:  you have a 'return' statement in your .bashrc, likely this will cause untold havoc.
+       This means that if you see '[ -z "$PS1" ] && return' then you must change this line to:
+       if [[ ! -z "$PS1" ]] ; then
+         ... original content that was below the && return line ...
+       fi # <= be sure to close the if.
+       #EOF .bashrc
+
+    If you have any questions about this please visit #rvm on irc.freenode.net.\n"
   fi
   echo -e "Installation of RVM to $rvm_path/ is complete.\n\n"
 fi

data/scripts/irbrc.rb

@@ -24,10 +24,11 @@ IRB.conf[:PROMPT][:RVM] = @prompt
 IRB.conf[:PROMPT_MODE] = :RVM
 
 # Load the user's irbrc file, if possible.
+# Report any errors that occur.
 begin
   load File.join(ENV["HOME"], ".irbrc") if File.exists?("#{ENV["HOME"]}/.irbrc")
+rescue LoadError => load_error
+  puts load_error
 rescue => exception
   puts "Error : 'load #{ENV["HOME"]}/.irbrc' : #{exception.message}"
 end
-
-# EOF

data/scripts/log

@@ -6,7 +6,7 @@ if [[ ! -z "$2" ]] ; then level=$1 ; shift ; else level="info" ; fi
 
 message=$1
 
-if [[ -z "$rvm_interactive" ]] || [[ -z "$TERM" ]] ; then
+if [[ -z "$rvm_interactive" ]] || [[ -z "$TERM" ]] || [[ "unknown" = "$TERM" ]] ; then
   case "$level" in
     debug) shift ; echo -e "<d>$message </d>"     ;;
     info)  shift ; echo -e "<i>$message </i>"     ;;

data/scripts/manage

@@ -32,7 +32,7 @@ __rvm_install_source() {
   if [[ -d "${rvm_path}/usr" ]] ; then export PATH="${rvm_path}/usr/bin:${PATH}" ; fi
 
   if [[ -z "$rvm_ruby_configure" ]] && [[ ! -s "$rvm_ruby_src_path/configure" ]] ; then
-    if which autoconf &> /dev/null ; then
+    if command -v autoconf > /dev/null ; then
       __rvm_run "autoconf" "autoconf" "Running autoconf"
     else
       result=$? ; $rvm_scripts_path/log "fail" "rvm requires autoconf to install the selected ruby interpreter however autoconf was not found in the PATH." ; return $result
@@ -141,16 +141,16 @@ __rvm_install_ruby() {
           __rvm_run "macruby/extract" "sudo /usr/sbin/installer -pkg '$rvm_archives_path/macruby_nightly.pkg' -target '/'"
           mkdir -p "$rvm_ruby_home/bin"
         else
-          macruby_path="/Library/Frameworks/MacRuby.framework/Versions/0.5/usr/bin"
+          macruby_path="/Library/Frameworks/MacRuby.framework/Versions/${rvm_ruby_version}/usr/bin"
           # TODO: Separated nightly from head.
-          $rvm_scripts_path/log "info" "Retrieving MacRuby 0.5 ..."
+          $rvm_scripts_path/log "info" "Retrieving MacRuby ${rvm_ruby_version} ..."
           $rvm_scripts_path/fetch "$rvm_url"
           result=$? ; if [[ "$result" -gt 0 ]] ; then
             $rvm_scripts_path/log "error" "There has been an error while trying to fetch the source. Aborting the installation." ; __rvm_pushpop ; return $result
           fi
           mkdir -p $rvm_ruby_src_path
-          unzip -o -j "$rvm_archives_path/$rvm_ruby_package_file" "MacRuby 0.5/MacRuby 0.5.pkg" -d "$rvm_ruby_src_path"
-          mv "$rvm_ruby_src_path/MacRuby 0.5.pkg" "$rvm_ruby_src_path/$rvm_ruby_string.pkg"
+          unzip -o -j "$rvm_archives_path/$rvm_ruby_package_file" "MacRuby ${rvm_ruby_version}/MacRuby ${rvm_ruby_version}.pkg" -d "$rvm_ruby_src_path"
+          mv "$rvm_ruby_src_path/MacRuby ${rvm_ruby_version}.pkg" "$rvm_ruby_src_path/$rvm_ruby_string.pkg"
           __rvm_run "macruby/extract" "sudo /usr/sbin/installer -pkg '$rvm_ruby_src_path/$rvm_ruby_string.pkg' -target '/'"
           mkdir -p "$rvm_ruby_home/bin"
         fi
@@ -220,7 +220,8 @@ RubyWrapper
           rvm_ree_options="${rvm_ree_options} --no-tcmalloc"
         fi
 
-        __rvm_run "install" "./installer -a $rvm_rubies_path/$rvm_ruby_interpreter-$rvm_ruby_version-$rvm_ruby_patch_level $rvm_ree_options --dont-install-useful-gems $rvm_ruby_configure_flags" "Installing $rvm_ruby_string, this may take a while, depending on your cpu(s)..."
+
+        __rvm_run "install" "./installer -a $rvm_rubies_path/$rvm_ruby_interpreter-$rvm_ruby_version-$rvm_ruby_patch_level $rvm_ree_options --dont-install-useful-gems $rvm_ruby_configure_flags --no-dev-docs" "Installing $rvm_ruby_string, this may take a while, depending on your cpu(s)..."
           result=$? ; if [[ "$result" -gt 0 ]] ; then
             $rvm_scripts_path/log "error" "There has been an error while trying to run the ree installer. Aborting the installation." ; __rvm_pushpop ; return $result
           fi
@@ -332,18 +333,7 @@ RubyWrapper
       for binary_name in "gem" ; do
         if [[ $binary_name != "gem" ]] ; then prefix="-S " ; else unset prefix; fi
 
-        ruby_wrapper=$(cat <<RubyWrapper
-#!/usr/bin/env bash
-
-export GEM_HOME="$rvm_ruby_gem_home"
-export GEM_PATH="$rvm_ruby_gem_path"
-export BUNDLE_PATH="$rvm_ruby_gem_home"
-export MY_RUBY_HOME="$rvm_ruby_home"
-export PATH="$rvm_ruby_home/bin:$rvm_ruby_gem_home/bin:$rvm_ruby_global_gems_path/bin:\$PATH"
-
-exec $rvm_ruby_home/bin/rbx $prefix$binary_name "\$@"
-RubyWrapper
-)
+        ruby_wrapper=$(echo -e "#!/usr/bin/env bash\nexec $rvm_ruby_home/bin/rbx $prefix$binary_name \"\$@\"")
         for file_name in "$rvm_ruby_home/bin/$binary_name" "$rvm_bin_path/$binary_name-$rvm_ruby_string"  ; do
           rm -f $file_name
           echo "$ruby_wrapper" > $file_name
@@ -360,7 +350,7 @@ RubyWrapper
     ;;
 
     jruby)
-      if ! which java &> /dev/null ; then
+      if ! command -v java > /dev/null; then
         echo -e "java must be installed and in your path in order to install JRuby." ; return 1
       fi
 
@@ -383,6 +373,7 @@ RubyWrapper
       __rvm_pushpop
 
       if [[ -z "$rvm_ruby_home" ]] || [[ "$rvm_ruby_home" = "/" ]] ; then echo "WTH?!?! rvm_ruby_home == / ??? not removing." ; return 1000000 ; fi
+
       rm -rf $rvm_ruby_home
       __rvm_run "install" "/bin/cp -Rf $rvm_ruby_src_path $rvm_ruby_home" "Installing JRuby to $rvm_ruby_home"
 
@@ -392,6 +383,10 @@ RubyWrapper
       done ; unset binary
       __rvm_pushpop
 
+      sed -e 's#^JAVA_VM=-client#JAVA_VM=-server#' $rvm_ruby_home/bin/jruby > $rvm_ruby_home/bin/jruby.new &&
+        mv $rvm_ruby_home/bin/jruby.new $rvm_ruby_home/bin/jruby
+      chmod +x $rvm_ruby_home/bin/jruby
+
       for binary in jrubyc jirb_swing jirb jgem rdoc ri spec autospec testrb ast generate_yaml_index.rb ; do
         __rvm_inject_gem_env $rvm_ruby_home/bin/$binary
       done ; unset binary
@@ -497,7 +492,7 @@ RubyWrapper
     ;;
 
     ironruby|ir)
-      if ! which mono &> /dev/null ; then
+      if ! command -v mono > /dev/null ; then
         echo -e "mono must be installed and in your path in order to install IronRuby." ; return 1
       fi
 
@@ -518,46 +513,60 @@ RubyWrapper
 
           __rvm_fetch_ruby
           if [[ $? -gt 0 ]] ; then result=$? ; return $result ; fi
+          builtin cd $rvm_ruby_src_path
+
+          $rvm_bin_path/rvm 1.8.7 -S gem install pathname2 --no-rdoc --no-ri
+
+          # MONO_LIB=/Library/Frameworks/Mono.framework/Versions/current/lib/
+          rvm_ruby_make="$rvm_bin_path/rvm 1.8.7 -S rake MERLIN_ROOT=\"$rvm_ruby_src_path/Merlin/Main\" compile mono=1 configuration=release --trace"
+          __rvm_run "rake" "$rvm_ruby_make" "Building IronRuby..."
+          if [[ $? -gt 0 ]] ; then result=$? ; return $result ; fi
+
+          rm -rf $rvm_ruby_home/*
+          mkdir -p $rvm_ruby_home/bin $rvm_ruby_home/lib $rvm_ruby_home/lib/ruby $rvm_ruby_home/lib/IronRuby
+
+          cp -r $rvm_ruby_src_path/Merlin/Main/Bin/mono_release/* $rvm_ruby_home/bin/
+          cp -r $rvm_ruby_src_path/Merlin/Main/Languages/Ruby/Scripts/bin/* $rvm_ruby_home/bin/
+          cp -r $rvm_ruby_src_path/Merlin/External.LCA_RESTRICTED/Languages/Ruby/redist-libs/ruby/* $rvm_ruby_home/lib/ruby
+          cp -r $rvm_ruby_src_path/Merlin/Main/Languages/Ruby/Libs/* $rvm_ruby_home/lib/IronRuby
       else
         $rvm_scripts_path/log "info" "Retrieving IronRuby"
+
         $rvm_scripts_path/fetch "$rvm_url" "$rvm_ruby_package_file"
         result=$? ; if [[ "$result" -gt 0 ]] ; then
           $rvm_scripts_path/log "error" "There has been an error while trying to fetch the source. Aborting the installation." ; __rvm_pushpop ; return $result
         fi
 
-        __rvm_run "extract" "tar zxf $rvm_archives_path/$rvm_ruby_package_file -C $rvm_src_path" "Extracting $rvm_ruby_package_file ..."
-        result=$? ; if [[ "$result" -gt 0 ]] ; then
-          $rvm_scripts_path/log "error" "There has been an error while trying to extract the source. Aborting the installation." ; __rvm_pushpop ; return $result
+        mkdir -p $rvm_ruby_src_path $rvm_ruby_home
+        unzip -o  -d ${rvm_ruby_src_path} ${rvm_archives_path}/${rvm_ruby_package_file} >> "$rvm_ruby_log_path/extract.log" 2>> "$rvm_ruby_log_path/extract.error.log"
+        result=$? ; if [[ "$result" -gt 1 ]] ; then
+          $rvm_scripts_path/log "error" "There has been an error while trying to extract $rvm_ruby_package_file. Aborting the installation." ; __rvm_pushpop ; return $result
         fi
 
-        rm -rf $rvm_ruby_src_path
-        mv $rvm_src_path/$rvm_ruby_package_name $rvm_ruby_src_path
-
-        #mv $rvm_ruby_home/ironruby/* $rvm_ruby_home
-        #rm -rf $rvm_ruby_home/ironruby
-        #mv $rvm_ruby_src_path/$rvm_ruby_package_file/* $rvm_ruby_home
-        #mv $rvm_ruby_home/lib/ironruby $rvm_ruby_home/lib/IronRuby
+        for dir in bin lib silverlight ; do
+          cp -Rf $rvm_src_path/$rvm_ruby_string/$dir "$rvm_ruby_home/$dir"
+        done
       fi
 
-      builtin cd $rvm_ruby_src_path
-
-      $rvm_bin_path/rvm 1.8.7 -S gem install pathname2 --no-rdoc --no-ri
-
-      # MONO_LIB=/Library/Frameworks/Mono.framework/Versions/current/lib/
-      rvm_ruby_make="$rvm_bin_path/rvm 1.8.7 -S rake MERLIN_ROOT=\"$rvm_ruby_src_path/Merlin/Main\" compile mono=1 configuration=release --trace"
-      __rvm_run "rake" "$rvm_ruby_make" "Building IronRuby..."
-      if [[ $? -gt 0 ]] ; then result=$? ; return $result ; fi
+      binaries=(gem irb rdoc rake ri ruby)
+      for binary_name in ${binaries[@]} ; do
+        if [[ -s $rvm_ruby_home/bin/$binary_name ]] ; then
+          cat "$rvm_ruby_home/bin/$binary_name" | tr -d '\r' > "$rvm_ruby_home/bin/$binary_name.new"
+          #sed -e '1,1s=.*=#!'"/usr/bin/env ir=" "$rvm_ruby_home/bin/$binary_name" > "$rvm_ruby_home/bin/$binary_name.new"
+          mv -f "$rvm_ruby_home/bin/$binary_name.new" "$rvm_ruby_home/bin/$binary_name"
+          chmod +x $rvm_ruby_home/bin/$binary_name
+        fi
+      done
 
-      rm -rf $rvm_ruby_home/*
-      mkdir -p $rvm_ruby_home/bin $rvm_ruby_home/lib $rvm_ruby_home/lib/ruby $rvm_ruby_home/lib/IronRuby
+      sed -e '1,1s=.*=#!'"/usr/bin/env bash=" "$rvm_ruby_home/bin/ir" | tr -d '\r' > "$rvm_ruby_home/bin/ir.new"
+      mv -f "$rvm_ruby_home/bin/ir.new" "$rvm_ruby_home/bin/ir"
+      chmod +x $rvm_ruby_home/bin/ir
+      ln -fs $rvm_ruby_home/bin/ir $rvm_ruby_home/bin/ruby
 
-      cp -r $rvm_ruby_src_path/Merlin/Main/Bin/mono_release/* $rvm_ruby_home/bin/
-      cp -r $rvm_ruby_src_path/Merlin/Main/Languages/Ruby/Scripts/bin/* $rvm_ruby_home/bin/
-      cp -r $rvm_ruby_src_path/Merlin/External.LCA_RESTRICTED/Languages/Ruby/redist-libs/ruby/* $rvm_ruby_home/lib/ruby
-      cp -r $rvm_ruby_src_path/Merlin/Main/Languages/Ruby/Libs/* $rvm_ruby_home/lib/IronRuby
+      __rvm_run "gems.install" "PATH=$rvm_ruby_home/bin:$PATH GEM_HOME=$rvm_ruby_gem_home GEM_PATH=$rvm_ruby_gem_home $rvm_ruby_home/bin/gem install --no-rdoc --no-ri rake $rvm_gem_options" "Installing $rvm_gem_name to $dir"
 
-      binaries="gem irb rdoc rake ri ruby"
-      for binary_name in $(echo $binaries); do
+      binaries=() # Don't wrap any longer.
+      for binary_name in ${binaries[@]} ; do
         binary_path=""
         if [[ "ruby" != "$binary_name" ]] ; then
           binary_path="$rvm_ruby_home/bin/i$binary_name"
@@ -607,7 +616,7 @@ RubyWrapper
       fi
 
       if [[ ! -s "$rvm_ruby_src_path/configure" ]] ; then
-        if which autoconf &> /dev/null ; then
+        if command -v autoconf &> /dev/null ; then
           __rvm_run "autoconf" "autoconf" "Running autoconf"
         else
           $rvm_scripts_path/log "fail" "rvm expects autoconf to install this ruby interpreter, autoconf was not found in PATH. Aborting installation." ; result=$? ; return $result
@@ -669,6 +678,8 @@ RubyWrapper
 
   esac
 
+  $rvm_scripts_path/hook "after_install"
+
   if [[ ! -z "$ruby_options" ]] ; then RUBYOPT=$ruby_options ; export RUBYOPT ; fi
 }
 
@@ -816,10 +827,12 @@ __rvm_remove_ruby() {
       else
         $rvm_scripts_path/log "info" "it seems that $dir/$rvm_ruby_string is already non existent."
       fi
+
       if [[ -e $rvm_bin_path/$rvm_ruby_string ]] ; then
         rm -f $rvm_bin_path/$rvm_ruby_string
       fi
-      if grep -q "$rvm_ruby_string" "$rvm_config_path/default" ; then
+
+      if grep -q "$rvm_ruby_string" "$rvm_config_path/default" 2>/dev/null ; then
         rm -f "$rvm_config_path/default"
       fi
     done ; unset dir
@@ -859,7 +872,7 @@ __rvm_post_install() {
     for dir in $rvm_ruby_global_gems_path $rvm_ruby_gem_home ; do
       GEM_HOME="$dir" ; GEM_PATH="$dir" ; BUNDLE_PATH="$dir"
       export GEM_HOME GEM_PATH BUNDLE_PATH
-      __rvm_run "gems.install" "$rvm_ruby_home/bin/gem install --no-rdoc --no-ri $rvm_gem_name $rvm_gem_options" "Installing $rvm_gem_name"
+      __rvm_run "gems.install" "$rvm_ruby_home/bin/gem install --no-rdoc --no-ri $rvm_gem_name $rvm_gem_options" "Installing $rvm_gem_name to $dir"
 
       if [[ -x $rvm_ruby_gem_home/bin/$rvm_gem_name ]] ; then
         if [[ "$rvm_ruby_gem_home" != "$rvm_ruby_home" ]] && [[ ! -x $rvm_ruby_home/bin/$rvm_gem_name ]] ; then

data/scripts/monitor

@@ -62,12 +62,11 @@ while : ; do
         if [[ "spec" = "$framework" ]] ; then
           rvm_action="spec"
           rvm_ruby_args="spec/spec_helper.rb ${changed_spec_files[*]}"
-          __rvm_do
-
+          $rvm_scripts_path/set $rvm_action $rvm_ruby_args
         elif [[ "test" = "$framework" ]] ; then
           rvm_action="ruby"
           rvm_ruby_args=" -r$(echo "${changed_test_files[*]}" | sed 's/ / -r/g') test/test_helper.rb"
-          __rvm_do
+          $rvm_scripts_path/set $rvm_action $rvm_ruby_args
         fi
         update=1
       fi
@@ -78,11 +77,11 @@ while : ; do
         if [[ "spec" = "$framework" ]] ; then
           rvm_action="spec"
           rvm_ruby_args="spec/"
-          __rvm_do
+          $rvm_scripts_path/set $rvm_action $rvm_ruby_args
         elif [[ "test" = "$framework" ]] ; then
           rvm_action="rake"
           rvm_ruby_args="test"
-          __rvm_do
+          $rvm_scripts_path/set $rvm_action $rvm_ruby_args
         fi
         update=1
       fi

data/scripts/notes

@@ -9,37 +9,43 @@ if [[ "Linux" = "$system" ]] ; then
   done
   echo -e "\n$(tput setaf 2)Notes for ${system} $release$(tput sgr0)\n"
 
-  rvm_apt_get_binary="$(which aptitude 2> /dev/null)"
-  rvm_emerge_binary="$(which emerge 2> /dev/null)"
-  rvm_pacman_binary="$(which pacman 2> /dev/null)"
-  rvm_yum_binary="$(which yum 2> /dev/null)"
+  rvm_apt_get_binary="$(command -v aptitude)"
+  rvm_emerge_binary="$(command -v emerge)"
+  rvm_pacman_binary="$(command -v pacman)"
+  rvm_yum_binary="$(command -v yum)"
 
   echo -e "\n    $item curl is required.\n"
   echo -e "\n    $item patch is required (for ree, some ruby head's).\n"
   if [[ ! -z "$rvm_apt_get_binary" ]] ; then
     echo -e "    $item For JRuby (if you wish to use it) you will need:"
     echo -e "\n       $ aptitude install curl sun-java6-bin sun-java6-jre sun-java6-jdk"
+
     echo -e "\n    $item For MRI & ree (if you wish to use it) you will need:"
-    echo -e "\n       $ aptitude install curl bison build-essential zlib1g-dev libssl-dev libreadline5-dev libxml2-dev git-core"
+    echo -e "\n       $ aptitude install curl bison build-essential zlib1g zlib1g-dev libssl-dev libreadline5-dev libreadline6-dev libxml2-dev git-core subversion"
+
     echo -e "\n    $item For IronRuby (if you wish to use it) you will need:"
     echo -e "\n       $ aptitude install curl mono-2.0-devel"
 
   elif [[ ! -z "$rvm_emerge_binary" ]] ; then
     echo -e "    $item For JRuby (if you wish to use it) you will need:"
     echo -e "\n       $ emerge dev-java/sun-jdk dev-java/sun-jre-bin"
+
     echo -e "\n    $item For IronRuby (if you wish to use it) you will need:"
     echo -e "\n       $ emerge dev-lang/mono"
 
   elif [[ ! -z "$rvm_pacman_binary" ]] ; then
     echo -e "    $item For JRuby (if you wish to use it) you will need:"
     echo -e "\n       $ pacman -Sy jdk jre curl"
+
     echo -e "\n    $item For IronRuby (if you wish to use it) you will need:"
     echo -e "\n       $ pacman -Sy mono"
 
   elif [[ ! -z "$rvm_yum_binary" ]] ; then
     echo -e "    $item For MRI/ree (if you wish to use it) you will need:"
-    echo -e "\n       $ yum install -y gcc-c++ patch readline readline-devel iconv-devel"
-    echo -e "    $item For JRuby (if you wish to use it) you will need:"
+    echo -e "\n       $ yum install -y gcc-c++ patch readline readline-devel zlib zlib-devel"
+    echo -e "\n       $ yum install -y iconv-devel # NOTE: For centos 5.4 final iconv-devel might not be available :("
+
+    echo -e "\n    $item For JRuby (if you wish to use it) you will need:"
     echo -e "\n       $ yum install -y java"
 
   else