rvm 0.0.48 → 0.0.49

data/scripts/{rvm-ruby-installer → ruby-installer}

@@ -2,8 +2,6 @@
 
 function __rvm_install_source {
   if [ -z "$rvm_selected" ] ; then __rvm_select $* ; fi
-
-  result=0
   __rvm_log "info" "Installing Ruby from source to: $rvm_ruby_home"
   mkdir -p $rvm_ruby_log_path
 
@@ -14,6 +12,7 @@ function __rvm_install_source {
     rm -rf $rvm_ruby_src_path
   fi
 
+  result=0
   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"}"
@@ -27,7 +26,7 @@ function __rvm_install_source {
     fi
   else
     __rvm_log "info" "Retrieving Ruby from $rvm_url"
-    if [ ! -z "`echo $rvm_url | grep '^git'`" ] ; then
+    if [ ! -z "`echo $rvm_url | awk '/^git/'`" ] ; then
       if [ -d "$rvm_ruby_src_path/.git" ] ; then
         cd $rvm_ruby_src_path
         if [ -z "$rvm_ruby_rev" ] ; then
@@ -73,10 +72,10 @@ function __rvm_install_source {
   cd $rvm_ruby_src_path
   if [ $? -gt 0 ] ; then result=$? ; __rvm_log "error" "There was an error, please check $rvm_ruby_log_path/*.error.log" ; __rvm_pushpop ; return $result ; fi
 
-  if [ ! -s "$rvm_ruby_src_path/configure" -a "$rvm_ruby_interpreter" = "ruby" ] ; then
+  if [ ! -s "$rvm_ruby_src_path/configure" ] ; then
     rvm_autoconf=`which autoconf`
     if [ $? -gt 0 ] ; then __rvm_log "fail" "rvm expects autoconf" ; result=$? ; return $result ; fi
-    __rvm_run "autoconf" $rvm_autoconf
+    __rvm_run "autoconf" "$rvm_autoconf"
     if [ $? -gt 0 ] ; then result=$? ; return $result ; fi
   fi
 
@@ -99,17 +98,17 @@ function __rvm_install_source {
 
   __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
+    __rvm_run "make" "/usr/bin/make $rvm_make_flags"
   else
-    __rvm_run "make" $rvm_ruby_make $rvm_make_flags
+    __rvm_run "make" "$rvm_ruby_make $rvm_make_flags"
   fi
   if [ $? -gt 0 ] ; then result=$? ; return $result ; fi
 
   if [ -z "$rvm_ruby_make" ] ; then
     __rvm_log "info" "Installing $rvm_ruby_package_name"
-    __rvm_run "install" make install
+    __rvm_run "install" "/usr/bin/make install"
   else
-    __rvm_run "install" $rvm_ruby_make_install
+    __rvm_run "install" "$rvm_ruby_make_install"
   fi
   if [ $? -gt 0 ] ; then result=$? ; return $result ; fi
 
@@ -127,8 +126,9 @@ function __rvm_install_source {
 
 function __rvm_install_ruby {
 
-  if [ -z "$rvm_selected" ] ; then __rvm_select $* ; fi
-  if [ ! -z "$RUBYOPT" ]    ; then ruby_options=$RUBYOPT ; unset RUBYOPT ; fi
+  if [ -z "$rvm_selected" ]   ; then __rvm_select $* ; fi
+  if [ ! -z "$RUBYOPT" ]      ; then ruby_options=$RUBYOPT ; unset RUBYOPT ; fi
+  if [ "`uname`" = "Darwin" ] ; then ARCHFLAGS="-arch x86_64 -arch i386" ; export ARCHFLAGS ; fi
 
   case "$rvm_ruby_interpreter" in
 
@@ -169,48 +169,60 @@ function __rvm_install_ruby {
     ;;
 
     ruby-enterprise|ree)
-      rvm_url="http://rubyforge.org/frs/download.php/58677/$rvm_ruby_package_name.tar.gz"
-      __rvm_log "info" "Installing Ruby Enterprise Edition from source to: $rvm_ruby_home"
-      __rvm_pushpop $rvm_source_path
-      if [ -d $rvm_ruby_src_path ]  ; then
-        cd $rvm_ruby_src_path
-      else
-        __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" "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" "Installing $rvm_ruby_package_name, this may take a while, depending on your cpu(s)..."
-      mkdir -p $rvm_ruby_log_path
+      if [ "$rvm_ruby_version" = "1.8.6" -a -z "$rvm_head_flag" ] ; then
+        rvm_url="http://rubyforge.org/frs/download.php/58677/$rvm_ruby_package_name.tar.gz"
+        __rvm_log "info" "Installing Ruby Enterprise Edition from source to: $rvm_ruby_home"
+        __rvm_pushpop $rvm_source_path
+        if [ -d $rvm_ruby_src_path ]  ; then
+          cd $rvm_ruby_src_path
+        else
+          __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" "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
 
-      cd $rvm_ruby_src_path
-      mkdir -p $rvm_ruby_home/lib/ruby/gems/1.8/gems
-      if [ ! -z "$rvm_ruby_configure" ] ; then rvm_ruby_configure="-c $rvm_ruby_configure"; fi
-      __rvm_run "install" ./installer -a $rvm_path/ruby-enterprise-$rvm_ruby_version-$rvm_ruby_patch_level --dont-install-useful-gems --no-tcmalloc $rvm_ruby_configure
-      if [ $? -gt 0 ] ; then result=$? ; return $result ; fi
-      chmod +x $rvm_ruby_home/bin/*
+        __rvm_log "info" "Installing $rvm_ruby_package_name, this may take a while, depending on your cpu(s)..."
+        mkdir -p $rvm_ruby_log_path
 
-      __rvm_rubygems_setup
+        cd $rvm_ruby_src_path
+        mkdir -p $rvm_ruby_home/lib/ruby/gems/1.8/gems
+        if [ ! -z "$rvm_ruby_configure" ] ; then rvm_ruby_configure="-c $rvm_ruby_configure"; fi
+        __rvm_run "install" ./installer -a $rvm_path/ruby-enterprise-$rvm_ruby_version-$rvm_ruby_patch_level --dont-install-useful-gems --no-tcmalloc $rvm_ruby_configure
+        if [ $? -gt 0 ] ; then result=$? ; return $result ; fi
+        chmod +x $rvm_ruby_home/bin/*
 
-      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
+        __rvm_rubygems_setup
 
-      __rvm_irbrc
-      __rvm_bin_scripts
-      __rvm_post_install
-      __rvm_pushpop
+        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
+        __rvm_irbrc
+        __rvm_bin_scripts
+        __rvm_post_install
+        __rvm_pushpop
+      else
+        rvm_url=`__rvm_db "ree_${rvm_ruby_version}_repo_url"`
+        if [ -z "$rvm_url" ] ; then
+          __rvm_log "fail" "rvm does not know the rvm repo url for 'ree_${rvm_ruby_version}'"
+          result=1
+        else
+          rvm_ruby_repo_url=$rvm_url
+          #rvm_ruby_configure="--enable-shared --enable-pthread $rvm_ruby_configure "
+          __rvm_install_source $*
+        fi
+      fi
     ;;
 
     rbx|rubinius)
       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
@@ -229,12 +241,11 @@ function __rvm_install_ruby {
       # prereqs, 1.8.6 w/ParseTree & rake. Yes this could all be one line... not pushing our luck.
       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
+        __rvm_run "build" "\`rvm 1.8.6 -m rbx ; RBX_LLVM=1 rake build\`"
       else
-        __rvm_run "build" $rake186rbx build
-      fi ; unset rake186rbx
+        __rvm_run "build" "\`rvm 1.8.6 -m rbx ; rake build\`"
+      fi
 
       for binary in ruby irb ; do
         ln -fs $rvm_ruby_home/bin/rbx $rvm_ruby_home/bin/$binary
@@ -253,7 +264,8 @@ PATH="$rvm_ruby_home/bin:$rvm_gem_home/bin:\$PATH" ; export PATH
 exec $rvm_ruby_home/bin/rbx -S $binary_name "\$@"
 RubyWrapper
 )
-        for file_name in $rvm_bin_path/gem-$rvm_ruby_package_name $rvm_ruby_home/bin/gem ; do
+        rm -f $rvm_path/bin/$binary-$rvm_ruby_package_name
+        for file_name in $rvm_path/bin/$binary-$rvm_ruby_package_name $rvm_ruby_home/bin/$binary ; do
           echo "$ruby_wrapper" > $file_name
           if [ -f $file_name ] ; then chmod +x $file_name ; fi
         done
@@ -298,39 +310,43 @@ RubyWrapper
         fi
       fi
 
-      for binary in jirb jruby jgem ; do
-        cp -f $rvm_ruby_src_path/bin/$binary $rvm_ruby_src_path/bin/${binary#j}
-      done ; unset binary
-
       __rvm_log "info" "Installing $rvm_ruby_package_name..."
       mkdir -p $rvm_ruby_home/bin/
-      __rvm_run "nailgun" "cd $rvm_ruby_src_path/tool/nailgun && make $rvm_make_flags"
+      __rvm_run "nailgun" "cd $rvm_ruby_src_path/tool/nailgun && /usr/bin/make $rvm_make_flags"
       __rvm_pushpop
-      chmod +x $rvm_ruby_home/bin/*
 
       if [ -z "$rvm_ruby_home" -o "$rvm_ruby_home" = "/" ] ; then echo "WTH?!?! rvm_ruby_home == / ??? not removing." ; return 1000000 ; fi
       rm -rf $rvm_ruby_home
       __rvm_run "sync" "/bin/cp -Rf $rvm_ruby_src_path $rvm_ruby_home"
 
-      for binary in rake rdoc ri spec autospec ; do
+      __rvm_pushpop $rvm_ruby_home/bin/
+      for binary in jirb jruby jgem ; do
+        ln -nfs $binary ${binary#j}
+      done ; unset binary
+      __rvm_pushpop
+
+      for binary in rake rdoc ri spec autospec \
+                     testrb jrubyc jirb_swing jirb jgem ast generate_yaml_index.rb; 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_rubygems_setup
+
+      __rvm_inject_gem_env $rvm_ruby_home/bin/gem # Ensure the env is set properly for gem.
+
       __rvm_irbrc
       __rvm_bin_script
+      __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 ; unset rvm_gem_name
-
     ;;
 
     ruby)
         # Merge configure options with user specified options
-        rvm_ruby_configure="--enable-shared=true --enable-pthread $rvm_ruby_configure "
+        rvm_ruby_configure="--enable-shared --enable-pthread $rvm_ruby_configure "
         if [ "`uname`" = "Darwin" ] ; then ARCHFLAGS="-arch x86_64 -arch i386" ; export ARCHFLAGS ; fi
       __rvm_install_source $*
     ;;
@@ -347,6 +363,7 @@ RubyWrapper
 }
 
 function __rvm_manage_rubies {
+  __rvm_state
   rubies=() ; successes=() ; errors=() ; statuses=()
   # TODO: Extract the common functionality out of the if below
   if [ ! -z "$rvm_ruby_string" ] ; then
@@ -363,7 +380,7 @@ function __rvm_manage_rubies {
     __rvm_${rvm_action}_ruby
   else # all
     if [ "$rvm_action" != "install" ] ; then
-      while read bin_line # Question: Should we prompt here? ;)
+      while read bin_line
       do # Keep this on second line damnit!
         if [ -x $bin_line ] ; then
           rvm_ruby_string="`dirname $bin_line | xargs dirname | xargs basename`"
@@ -371,8 +388,11 @@ function __rvm_manage_rubies {
           __rvm_unset_ruby_variables
         fi
       done < <(/bin/ls $rvm_path/*/bin/ruby 2> /dev/null)
+    else
+      __rvm_log "warn" "Really? Install all? See 'rvm list --all' and limit the selection to something more sane please :)"
     fi
   fi
+  __rvm_state
 
   if [ ! -z "$rvm_summary_flag" ] ; then __rvm_summary ; fi
   if [ ! -z "$rvm_yaml_flag" ]    ; then __rvm_yaml    ; fi
@@ -455,7 +475,17 @@ function __rvm_post_install {
 }
 
 function __rvm_rubygems_setup {
-  if [ -z "`echo $rvm_ruby_version | awk '/^1\.9/'`" ] ; then
+  if [ ! -z "`echo $rvm_ruby_version | awk '/^1\.9/'`" ] ; then
+    # 1.9 has it's own built-in gem command
+    __rvm_inject_ruby_shebang "$rvm_ruby_src_path/bin/gem"
+    cp $rvm_ruby_src_path/bin/gem $rvm_ruby_home/bin/gem
+    __rvm_run "rubygems.update" $rvm_ruby_home/bin/gem update --system
+  elif [ ! -z "`echo $rvm_ruby_interpreter | awk '/^jruby/'`" ] ; then
+    # jruby has it's own built-in gem command
+    __rvm_inject_ruby_shebang "$rvm_ruby_src_path/bin/gem"
+    cp $rvm_ruby_src_path/bin/gem $rvm_ruby_home/bin/gem
+    __rvm_run "rubygems.update" $rvm_ruby_home/bin/gem update --system
+  else
     __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"
@@ -472,11 +502,6 @@ function __rvm_rubygems_setup {
       __rvm_log "info" "Installation of rubygems $rvm_ruby_package_name completed successfully."
     fi
     __rvm_inject_ruby_shebang "$rvm_ruby_home/bin/gem"
-  else
-    # 1.9 has it's own built-in gem command
-    __rvm_inject_ruby_shebang "$rvm_ruby_src_path/bin/gem"
-    cp $rvm_ruby_src_path/bin/gem $rvm_ruby_home/bin/gem
-    __rvm_run "rubygems.update" $rvm_ruby_home/bin/gem update --system
   fi
   return $result
 }
@@ -484,7 +509,7 @@ function __rvm_rubygems_setup {
 function __rvm_inject_ruby_shebang {
   __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
+    sed -i.orig -e "s=env [j]*ruby=env $rvm_ruby_home/bin/ruby=" $actual_file
     rm -f $actual_file.orig ; chmod +x $actual_file
   fi ; unset actual_file
 }

data/scripts/rvm

@@ -9,10 +9,10 @@
 if [ -s ~/.rvmrc ] ; then source ~/.rvmrc ; fi
 eval rvm_path="${rvm_path:-~/.rvm}"
 
-source $rvm_path/scripts/rvm-utility
-source $rvm_path/scripts/rvm-selector
-source $rvm_path/scripts/rvm-ruby-installer # TODO: Script not function.
-source $rvm_path/scripts/rvm-cli
+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
 
 if [ -f $rvm_path/default ] ; then source $rvm_path/default ; fi
 

data/scripts/rvm-install

@@ -33,62 +33,63 @@ done ; unset file_name
 
 results=$(grep 'scripts/rvm' ~/.bash_profile ~/.bashrc ~/.zshrc > /dev/null)
 if [ $? -gt 0 ] ; then
-  while : ; do
-    echo -n -e "$question Do you want this (s)cript to set this up for you, or do it (m)anually yourself ('s' or 'm')? "
-    read response
-    if [ "${response:0:1}" = "s" ] ; then
-      echo 'w00t!'
-      break
-    elif [ "${response:0:1}" = "m" ] ; then
-      echo -e "    Please make sure that this line is in place."
-      break
-    fi
-  done
-
-  if [ "${response:0:1}" = "s" ] ; then
-
+  if [ ! -z "`echo $PS1`" ] ; then
     while : ; do
-      echo -n -e "$question Do you use b(a)sh or (z)sh or b(o)th for your shell (the default on most *nix systems is bash, press control + C to cancel the installation)\n(a/z/o)? "
+      echo -n -e "$question Do you want this (s)cript to set this up for you, or do it (m)anually yourself ('s' or 'm')? "
       read response
-      if [ "${response:0:1}" = "a" ] ; then
-        user_shell="bash"
+      if [ "${response:0:1}" = "s" ] ; then
+        echo 'w00t!'
         break
-      elif [ "${response:0:1}" = "z" ] ; then
-        user_shell="zsh"
-        break
-      elif [ "${response:0:1}" = "o" ] ; then
-        user_shell="both"
+      elif [ "${response:0:1}" = "m" ] ; then
+        echo -e "    Please make sure that this line is in place."
         break
       fi
     done
 
-    if [ "$user_shell" = "bash" -o "$user_shell" = "both" ] ; then
+    if [ "${response:0:1}" = "s" ] ; then
 
-      touch ~/.bash_profile
-      if [ -z "`grep '\.rvm/scripts/rvm' ~/.bash_profile`" ] ; then
-        echo "Adding 'if [ -s ~/.rvm/scripts/rvm ] ; then source ~/.rvm/scripts/rvm ; fi' to your ~/.bash_profile."
-        echo -e "\n" >> ~/.bash_profile
-        echo "if [ -s ~/.rvm/scripts/rvm ] ; then source ~/.rvm/scripts/rvm ; fi" >> ~/.bash_profile
-      fi
-      touch ~/.bashrc
-      if [ -z "`grep '\.rvm/scripts/rvm' ~/.bashrc`" ] ; then
-        echo "Adding 'if [ -s ~/.rvm/scripts/rvm ] ; then source ~/.rvm/scripts/rvm ; fi' to your ~/.bashrc."
-        echo -e "\n" >> ~/.bashrc
-        echo "if [ -s ~/.rvm/scripts/rvm ] ; then source ~/.rvm/scripts/rvm ; fi" >> ~/.bashrc
-      fi
+      while : ; do
+        echo -n -e "$question Do you use b(a)sh or (z)sh or b(o)th for your shell (the default on most *nix systems is bash, press control + C to cancel the installation)\n(a/z/o)? "
+        read response
+        if [ "${response:0:1}" = "a" ] ; then
+          user_shell="bash"
+          break
+        elif [ "${response:0:1}" = "z" ] ; then
+          user_shell="zsh"
+          break
+        elif [ "${response:0:1}" = "o" ] ; then
+          user_shell="both"
+          break
+        fi
+      done
+    fi
+  else
+    user_shell="both"
+  fi
 
+  if [ "$user_shell" = "bash" -o "$user_shell" = "both" ] ; then
+    touch ~/.bash_profile
+    if [ -z "`grep '\.rvm/scripts/rvm' ~/.bash_profile`" ] ; then
+      echo "Adding 'if [ -s ~/.rvm/scripts/rvm ] ; then source ~/.rvm/scripts/rvm ; fi' to your ~/.bash_profile."
+      echo -e "\n" >> ~/.bash_profile
+      echo "if [ -s ~/.rvm/scripts/rvm ] ; then source ~/.rvm/scripts/rvm ; fi" >> ~/.bash_profile
+    fi
+    touch ~/.bashrc
+    if [ -z "`grep '\.rvm/scripts/rvm' ~/.bashrc`" ] ; then
+      echo "Adding 'if [ -s ~/.rvm/scripts/rvm ] ; then source ~/.rvm/scripts/rvm ; fi' to your ~/.bashrc."
+      echo -e "\n" >> ~/.bashrc
+      echo "if [ -s ~/.rvm/scripts/rvm ] ; then source ~/.rvm/scripts/rvm ; fi" >> ~/.bashrc
     fi
 
-    if [ "$user_shell" = "zsh" -o "$user_shell" = "both" ] ; then
+  fi
 
-      touch ~/.zshrc
-      if [ -z "`grep '\.rvm/scripts/rvm' ~/.zshrc`" ] ; then
-        echo "Adding 'if [ -s ~/.rvm/scripts/rvm ] ; then source ~/.rvm/scripts/rvm ; fi' to your ~/.zshrc."
-        echo -e "\n" >> ~/.zshrc
-        echo "if [ -s ~/.rvm/scripts/rvm ] ; then source ~/.rvm/scripts/rvm ; fi" >> ~/.zshrc
-      fi
+  if [ "$user_shell" = "zsh" -o "$user_shell" = "both" ] ; then
+    touch ~/.zshrc
+    if [ -z "`grep '\.rvm/scripts/rvm' ~/.zshrc`" ] ; then
+      echo "Adding 'if [ -s ~/.rvm/scripts/rvm ] ; then source ~/.rvm/scripts/rvm ; fi' to your ~/.zshrc."
+      echo -e "\n" >> ~/.zshrc
+      echo "if [ -s ~/.rvm/scripts/rvm ] ; then source ~/.rvm/scripts/rvm ; fi" >> ~/.zshrc
     fi
-
   fi
 fi
 
@@ -132,30 +133,30 @@ if [ "$system" = "Linux" ] ; 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 "      $ sudo apt-get 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 "      $ sudo apt-get install libreadline5-dev libssl-dev bison"
+    echo -e "      $item For jRuby (if you wish to use it) you will need:"
+    echo -e "         $ sudo apt-get 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 "         $ sudo apt-get install libreadline5-dev libssl-dev bison"
 
   elif [ ! -z "$rvm_emerge_binary" ] ; then
-    echo -e "    $item For jRuby (if you wish to use it) you will need:"
-    echo -e "      $ sudo 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 "         $ sudo 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 "      $ sudo pacman -Sy jdk jre"
+    echo -e "      $item For jRuby (if you wish to use it) you will need:"
+    echo -e "         $ sudo 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 [ "$system" = "Darwin" ] ; 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.:"