rvm 0.0.98 → 0.0.99

data/binscripts/rvm

@@ -13,4 +13,7 @@ if [[ -z "$rvm_path" ]] ; then
 fi
 
 source $rvm_path/scripts/rvm
+
+unset rvm_interactive
+
 rvm "$*"

data/binscripts/rvmsudo

@@ -1,2 +1,7 @@
 #!/usr/bin/env bash
-eval "sudo GEM_HOME=$GEM_HOME GEM_PATH=$GEM_PATH PATH=$PATH" "$@"
+
+prefix="PATH='$PATH'"
+if [[ ! -z "$GEM_HOME" ]] ; then prefix="GEM_HOME='$GEM_HOME' $prefix" ; fi
+if [[ ! -z "$GEM_PATH" ]] ; then prefix="GEM_PATH='$GEM_PATH' $prefix" ; fi
+
+eval "sudo" "/usr/bin/env $prefix $@"

data/config/db

@@ -29,4 +29,4 @@ ruby_1.9.1_patch_level=376
 ruby_1.9.2_patch_level=preview1
 ruby_1.8.5_patch_level=231
 ruby_1.8.6_patch_level=383
-ruby_1.8.7_patch_level=174
+ruby_1.8.7_patch_level=248

data/install

@@ -1,5 +1,7 @@
 #!/usr/bin/env bash
 
+if [[ "--auto" = "$1" ]] ; then rvm_auto_flag=1 ; else unset rvm_auto_flag ; fi
+
 if [[ -f /etc/rvmrc ]] ; then source /etc/rvmrc ; fi
 if [[ -f "$HOME/.rvmrc" ]] ; then source "$HOME/.rvmrc" ; fi
 
@@ -15,6 +17,8 @@ fi
 source scripts/utility
 source scripts/initialize
 
+__rvm_initialize
+
 #
 # Setup
 #
@@ -26,8 +30,7 @@ if [[ ! -d "$source_dir" ]] ; then unset source_dir ; fi
 source_dir="${source_dir:-$cwd}"
 
 # State what is required to use rvm
-echo -e "\n$(tput setaf 2)rvm$(tput sgr0) - shell scripts that allows a user to manage multiple ruby versions in their own account."
-echo -e "\n    Prepairing $rvm_path ..."
+echo -e "\nInstalling rvm to $rvm_path/ ..."
 for dir_name in src scripts bin log archives config gems examples ; do
   mkdir -p "$rvm_path/$dir_name"
 done
@@ -36,7 +39,6 @@ cp -f "$source_dir/README" "$rvm_path/"
 #
 # Scripts
 #
-echo -e "\n    Installing rvm to $rvm_path/ ..."
 rm -rf $rvm_path/scripts # Clear the old scripts directory so that the old style rvm- scripts are cleared out.
 for dir_name in config scripts examples lib hooks ; do
   mkdir -p "$rvm_path/$dir_name"
@@ -52,7 +54,6 @@ fi
 #
 # Bin Scripts
 #
-echo -e "\n    Installing bin scripts to $rvm_path/bin ..."
 # Cleanse and purge...
 rm -f $rvm_path/bin/rvm ; rm -rf $rvm_path/bin/binscripts
 for file in rvm-prompt rvm rvmsudo ; do
@@ -63,42 +64,55 @@ chmod +x $rvm_path/bin/*
 #
 # RC Files
 #
-echo -e "\n    Checking rc files ($rvm_rc_files) ..."
-if [[ "$rvm_loaded_flag" != "1" ]] ; then
-  for rcfile in $(echo $rvm_rc_files) ; do
-    if [[ ! -f $rcfile ]] ; then touch $rcfile ; fi
-    if [[ -s "$HOME/.profile" ]] ; then
-      if ! grep -q '.profile' "$rcfile" ; then
-        echo "    Adding 'if [[ -s \$HOME/.profile ]] ; then source \$HOME ; fi' to $rcfile."
-        echo -e "\n# rvm-install added line:\nif [[ -s \$HOME/.profile ]] ; then source \$HOME/.profile ; fi\n" >> $rcfile
+if [[ ! -z "$rvm_auto_flag" ]] ; then
+  echo -e "Checking rc files... ($rvm_rc_files)"
+  if [[ "$rvm_loaded_flag" != "1" ]] ; then
+    for rcfile in $(echo $rvm_rc_files) ; do
+      if [[ ! -f $rcfile ]] ; then touch $rcfile ; fi
+      if [[ -s "$HOME/.profile" ]] ; then
+        if ! grep -q '.profile' "$rcfile" ; then
+          echo "    Adding 'if [[ -s \$HOME/.profile ]] ; then source \$HOME ; fi' to $rcfile."
+          echo -e "\n# rvm-install added line:\nif [[ -s \$HOME/.profile ]] ; then source \$HOME/.profile ; fi\n" >> $rcfile
+        fi
       fi
-    fi
-    if ! grep -q "scripts\/rvm" "$rcfile" ; then
-      echo "    Adding 'if [[ -s $rvm_path/scripts/rvm ]] ; then source $rvm_path/scripts/rvm ; fi' to $rcfile."
-      echo -e "\n# rvm-install added:\nif [[ -s $rvm_path/scripts/rvm ]] ; then source $rvm_path/scripts/rvm ; fi\n" >> $rcfile
-    fi
-  done
+      if ! grep -q "scripts\/rvm" "$rcfile" ; then
+        echo "    Adding 'if [[ -s $rvm_path/scripts/rvm ]] ; then source $rvm_path/scripts/rvm ; fi' to $rcfile."
+        echo -e "\n# rvm-install added:\nif [[ -s $rvm_path/scripts/rvm ]] ; then source $rvm_path/scripts/rvm ; fi\n" >> $rcfile
+      fi
+    done
+  fi
 fi
 
 if [[ "root" = "$(whoami)" ]] ; then
   echo -e "\n    Symlinking rvm to $rvm_symlink_path/rvm ..."
   mkdir -p $rvm_symlink_path
   ln -nfs $rvm_path/bin/rvm $rvm_symlink_path/rvm
+  ln -nfs $rvm_path/bin/rvmsudo $rvm_symlink_path/rvmsudo
   chmod +x $rvm_symlink_path/rvm
+  chmod +x $rvm_symlink_path/rvmsudo
 fi
 
-#
-# System Checks
-#
+echo -e "\n$(tput setaf 2)rvm$(tput sgr0) - shell scripts that allows a user to manage multiple ruby versions in their own account."
 $rvm_path/scripts/notes
 
-echo -e "    $item In order to use rvm the following line must occur in your shell's loading files, after all path/variable settings:"
-echo -e "\n       if [[ -s $rvm_path/scripts/rvm ]] ; then source $rvm_path/scripts/rvm ; fi"
-echo -e "\n    $item CLOSE THIS SHELL AND OPEN A NEW ONE in order to use rvm."
-
-echo -e "\n$(tput setaf 2)RTFM:\n    $(tput sgr0) http://rvm.beginrescueend.com/ \n"
-echo -e "$(tput setaf 2)w⦿‿⦿t!$(tput sgr0)"
+echo -e "$(tput setaf 2)RTFM: $(tput sgr0) http://rvm.beginrescueend.com/"
+echo -e "\n$(tput setaf 2)HELP: $(tput sgr0) http://webchat.freenode.net/?channels=rvm "
+echo "================================================================================"
+name="$(awk -F= '/^[[:space:]]*name/{print $2}' ~/.gitconfig 2>/dev/null)"
+echo -e "\n${name:-"$(whoami)"},\n"
+echo -e "\nThank you for using rvm. I hope that it makes your work easier and more enjoyable."
+echo -e "If you have any questions, issues and/or ideas for improvement please hop in #rvm on irc.freenode.net and let me know."
+echo -e "My irc nickname is 'wayneeseguin' and I hang out from ~09:00-17:00EST and again from ~21:00EST-~00:00EST."
+echo -e "If I do not respond right away, please hang around after asking your question, I will respond as soon as I am back."
+echo -e "\n  w$(tput setaf 2)⦿‿⦿$(tput sgr0)t!"
 echo -e "\n    ~ Wayne\n"
+echo "================================================================================"
+
+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(.bash_profile and/or .zshenv), 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 "\n3) $(tput setaf 1)CLOSE THIS SHELL$(tput sgr0) and open a new one in order to use rvm.\n"
 
 if [[ -x "$rvm_path/bin/rvm" ]] ; then "$rvm_path/bin/rvm" -v ; fi
 

data/lib/VERSION.yml

@@ -1,4 +1,4 @@
 ---
 :major: 0
 :minor: 0
-:patch: 98
+:patch: 99

data/rvm.gemspec

@@ -1,15 +1,15 @@
 # Generated by jeweler
-# DO NOT EDIT THIS FILE
-# Instead, edit Jeweler::Tasks in Rakefile, and run `rake gemspec`
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{rvm}
-  s.version = "0.0.98"
+  s.version = "0.0.99"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Wayne E. Seguin"]
-  s.date = %q{2009-12-21}
+  s.date = %q{2009-12-27}
   s.default_executable = %q{rvm-install}
   s.description = %q{Manages Ruby interpreter installations and switching between them.}
   s.email = %q{wayneeseguin@gmail.com}
@@ -45,6 +45,7 @@ Gem::Specification.new do |s|
      "scripts/functions",
      "scripts/gems",
      "scripts/hash",
+     "scripts/hook",
      "scripts/initialize",
      "scripts/install",
      "scripts/irbrc",
@@ -90,3 +91,4 @@ Gem::Specification.new do |s|
   else
   end
 end
+

data/scripts/cd

@@ -6,13 +6,18 @@ cd() {
   if [[ "$rvm_project_rvmrc" != 0 ]] ; then
     local cwd ; cwd=$(pwd)
     while : ; do
-      if [[ -f "$cwd/.rvmrc" ]] ; then source "$cwd/.rvmrc" ; break ; fi
-      cwd=$(dirname $cwd)
       if [[ -z "$cwd" ]] || [[ "$HOME" = "$cwd" ]] || [[ "/" = "$cwd" ]] ; then
         if [[ "$rvm_project_rvmrc_default" != 0 ]] ; then
           rvm default 1>/dev/null 2>&1
         fi
         break
+      else
+        if [[ -f "$cwd/.rvmrc" ]] ; then
+          source "$cwd/.rvmrc"
+          break
+        else
+          cwd=$(dirname "$cwd")
+        fi
       fi
     done
   fi

data/scripts/cli

@@ -7,7 +7,7 @@ __rvm_meta() {
   rvm_meta_version="${rvm_version}"
 }
 
-__rvm_version() { __rvm_meta ; echo "rvm ${rvm_meta_version} by ${rvm_meta_author} (${rvm_meta_author_email}) [${rvm_meta_website}]" ; }
+__rvm_version() { __rvm_meta ; echo -e "\nrvm ${rvm_meta_version} by ${rvm_meta_author} (${rvm_meta_author_email}) [${rvm_meta_website}]\n" ; }
 
 __rvm_usage() { cat "${rvm_path:-$HOME/.rvm}/README" | ${PAGER:-less} ; }
 
@@ -344,6 +344,8 @@ __rvm_parse_args() {
 }
 
 rvm() {
+  if [[ ! -z "$PS1" ]] ; then export rvm_interactive=1 ; else unset rvm_interactive ; fi
+
   if [[ -z "$ZSH_VERSION" ]] ; then
     trap 'rm -rf "$rvm_path/tmp/$$" >/dev/null 2>&1' 0 1 2 3 15
   fi

data/scripts/fetch

@@ -1,5 +1,9 @@
 #!/usr/bin/env bash
 
+if [[ ! -z "$rvm_trace_flag" ]] ; then set -x ; export rvm_trace_flag ; fi
+
+trap "if [[ -d $rvm_path/tmp/ ]] && [[ -f $rvm_path/tmp/$$ ]] ; then rm -f $rvm_path/tmp/$$ > /dev/null 2>&1 ; fi ; exit" 0 1 2 3 15
+
 if ! which curl &> /dev/null; then
   $rvm_scripts_path/log "fail" "rvm requires curl, which does not seem to exist in your path :("
   exit 1

data/scripts/gems

@@ -8,6 +8,7 @@ color_yellow=$($rvm_scripts_path/color "yellow")
 color_none=$($rvm_scripts_path/color "none")
 
 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
 
 trap "if [[ -d $rvm_path/tmp/ ]] && [[ -f $rvm_path/tmp/$$ ]] ; then rm -f $rvm_path/tmp/$$ > /dev/null 2>&1 ; fi ; exit" 0 1 2 3 15
@@ -21,7 +22,7 @@ __rvm_gems_dir() {
 }
 
 __rvm_gems_list() {
-  if [[ $rvm_dir =~ rvm ]] ; then
+  if [[ $rvm_path =~ rvm ]] ; then
     for gemdir in "${rvm_gem_path}"/${rvm_ruby_string}%* ; do
       echo "$gemdir" | awk -F'%' '{print $2}'
     done
@@ -51,6 +52,8 @@ __rvm_gems_delete() {
 }
 
 __rvm_gems_dump() {
+  rvm_file_name="${rvm_file_name:-$gems_args}"
+
   if [[ ! -z "$rvm_ruby_gem_home" ]] ; then
     GEM_HOME="$rvm_ruby_gem_home" ; export GEM_HOME ;
     GEM_PATH="$rvm_ruby_gem_home" ; export GEM_PATH ;
@@ -153,11 +156,12 @@ __rvm_parse_gem_line() {
     gem_file_name="${gem_name/ /}-${gem_version/ /}.gem"
   fi
 }
+
 __rvm_gem_install() {
   __rvm_parse_gem_line $*
 
-  installed_gem="$(ls ${rvm_ruby_gem_home}/specifications/${gem_file_name}*spec 2>/dev/null | head -n 1)"
-  if [[ -z "$rvm_force_flag" ]] && [[ -f "$installed_gem" ]] ; then
+  installed_gems="$(ls ${rvm_ruby_gem_home}/specifications/ 2>/dev/null)"
+  if [[ -z "$rvm_force_flag" ]] && [[ ! -z "$(echo $installed_gems | awk '/'${gem_file_name}spec'/')" ]] ; then
     unset gem
     $rvm_scripts_path/log "info" "$color_green$gem_name $gem_version$yellow exists, skipping (--force to re-install)"
   else
@@ -202,10 +206,10 @@ __rvm_gem_install() {
     # TODO: Set vars if fourth field is non-empty (means that there are conditional statements to execute in the gem install line.
     if [[ "rvm_make_flags_flag" -eq 1 ]] ; then __rvm_make_flags ; fi
 
-    if [[ ! -z "$rvm_ruby_gem_home" ]] ; then
-      command="GEM_HOME='$rvm_ruby_gem_home' GEM_PATH='$rvm_ruby_gem_home' $gem_prefix gem install --no-rdoc --no-ri -q $gem $gem_postfix $vars"
+    if [[ ! -z "$rvm_ruby_gem_home" ]] && [[ "$rvm_ruby_gem_home" != "$rvm_gem_path" ]] ; then
+      command="GEM_HOME='$rvm_ruby_gem_home' GEM_PATH='$rvm_ruby_gem_home' $gem_prefix gem install $rvm_gem_options $gem $gem_postfix $vars"
     else
-      command="$gem_prefix gem install --no-rdoc --no-ri -q $gem $gem_postfix $vars"
+      command="$gem_prefix gem install $rvm_gem_options -q $gem $gem_postfix $vars"
     fi
     __rvm_run "gem.install" "$command" "$gem_name $gem_version is not installed, installing..."
     result=$?

data/scripts/hook

@@ -0,0 +1,12 @@
+#!//usr/bin/env bash
+
+if [[ ! -z "$rvm_trace_flag" ]] ; then set -x ; export rvm_trace_flag ; fi
+
+trap "if [[ -d $rvm_path/tmp/ ]] && [[ -f $rvm_path/tmp/$$ ]] ; then rm -f $rvm_path/tmp/$$ > /dev/null 2>&1 ; fi ; exit" 0 1 2 3 15
+
+if [[ ! -z "$1" ]] ; then
+  if [[ -s "$rvm_hooks_path/$1" ]] ; then
+    if [[ "$rvm_verbose_flag" -eq 1 ]] || [[ "$rvm_debug_flag" -eq 1 ]] ; then $rvm_scripts_path/log "info" "running hook $1" ; fi
+    source "$rvm_hooks_path/$1"
+  fi
+fi

data/scripts/initialize

@@ -30,7 +30,7 @@ rvm_config_path="${rvm_config_path:-"$rvm_path/config"}"
 rvm_hooks_path="${rvm_hooks_path:-"$rvm_path/hooks"}"
 rvm_tmp_path="${rvm_tmp_path:-"$rvm_path/tmp"}"
 rvm_symlink_path="${rvm_symlink_path:-/usr/local/bin}"
+rvm_gem_options="${rvm_gem_options:-"--no-rdoc --no-ri"}"
 
 export rvm_path rvm_scripts_path rvm_archives_path rvm_src_path rvm_log_path rvm_bin_path rvm_gem_path rvm_config_path rvm_tmp_path
 
-__rvm_initialize

data/scripts/install

@@ -1,5 +1,7 @@
 #!/usr/bin/env bash
 
+if [[ "--auto" = "$1" ]] ; then rvm_auto_flag=1 ; else unset rvm_auto_flag ; fi
+
 if [[ -f /etc/rvmrc ]] ; then source /etc/rvmrc ; fi
 if [[ -f "$HOME/.rvmrc" ]] ; then source "$HOME/.rvmrc" ; fi
 
@@ -15,6 +17,8 @@ fi
 source scripts/utility
 source scripts/initialize
 
+__rvm_initialize
+
 #
 # Setup
 #
@@ -26,8 +30,7 @@ if [[ ! -d "$source_dir" ]] ; then unset source_dir ; fi
 source_dir="${source_dir:-$cwd}"
 
 # State what is required to use rvm
-echo -e "\n$(tput setaf 2)rvm$(tput sgr0) - shell scripts that allows a user to manage multiple ruby versions in their own account."
-echo -e "\n    Prepairing $rvm_path ..."
+echo -e "\nInstalling rvm to $rvm_path/ ..."
 for dir_name in src scripts bin log archives config gems examples ; do
   mkdir -p "$rvm_path/$dir_name"
 done
@@ -36,7 +39,6 @@ cp -f "$source_dir/README" "$rvm_path/"
 #
 # Scripts
 #
-echo -e "\n    Installing rvm to $rvm_path/ ..."
 rm -rf $rvm_path/scripts # Clear the old scripts directory so that the old style rvm- scripts are cleared out.
 for dir_name in config scripts examples lib hooks ; do
   mkdir -p "$rvm_path/$dir_name"
@@ -52,7 +54,6 @@ fi
 #
 # Bin Scripts
 #
-echo -e "\n    Installing bin scripts to $rvm_path/bin ..."
 # Cleanse and purge...
 rm -f $rvm_path/bin/rvm ; rm -rf $rvm_path/bin/binscripts
 for file in rvm-prompt rvm rvmsudo ; do
@@ -63,42 +64,55 @@ chmod +x $rvm_path/bin/*
 #
 # RC Files
 #
-echo -e "\n    Checking rc files ($rvm_rc_files) ..."
-if [[ "$rvm_loaded_flag" != "1" ]] ; then
-  for rcfile in $(echo $rvm_rc_files) ; do
-    if [[ ! -f $rcfile ]] ; then touch $rcfile ; fi
-    if [[ -s "$HOME/.profile" ]] ; then
-      if ! grep -q '.profile' "$rcfile" ; then
-        echo "    Adding 'if [[ -s \$HOME/.profile ]] ; then source \$HOME ; fi' to $rcfile."
-        echo -e "\n# rvm-install added line:\nif [[ -s \$HOME/.profile ]] ; then source \$HOME/.profile ; fi\n" >> $rcfile
+if [[ ! -z "$rvm_auto_flag" ]] ; then
+  echo -e "Checking rc files... ($rvm_rc_files)"
+  if [[ "$rvm_loaded_flag" != "1" ]] ; then
+    for rcfile in $(echo $rvm_rc_files) ; do
+      if [[ ! -f $rcfile ]] ; then touch $rcfile ; fi
+      if [[ -s "$HOME/.profile" ]] ; then
+        if ! grep -q '.profile' "$rcfile" ; then
+          echo "    Adding 'if [[ -s \$HOME/.profile ]] ; then source \$HOME ; fi' to $rcfile."
+          echo -e "\n# rvm-install added line:\nif [[ -s \$HOME/.profile ]] ; then source \$HOME/.profile ; fi\n" >> $rcfile
+        fi
       fi
-    fi
-    if ! grep -q "scripts\/rvm" "$rcfile" ; then
-      echo "    Adding 'if [[ -s $rvm_path/scripts/rvm ]] ; then source $rvm_path/scripts/rvm ; fi' to $rcfile."
-      echo -e "\n# rvm-install added:\nif [[ -s $rvm_path/scripts/rvm ]] ; then source $rvm_path/scripts/rvm ; fi\n" >> $rcfile
-    fi
-  done
+      if ! grep -q "scripts\/rvm" "$rcfile" ; then
+        echo "    Adding 'if [[ -s $rvm_path/scripts/rvm ]] ; then source $rvm_path/scripts/rvm ; fi' to $rcfile."
+        echo -e "\n# rvm-install added:\nif [[ -s $rvm_path/scripts/rvm ]] ; then source $rvm_path/scripts/rvm ; fi\n" >> $rcfile
+      fi
+    done
+  fi
 fi
 
 if [[ "root" = "$(whoami)" ]] ; then
   echo -e "\n    Symlinking rvm to $rvm_symlink_path/rvm ..."
   mkdir -p $rvm_symlink_path
   ln -nfs $rvm_path/bin/rvm $rvm_symlink_path/rvm
+  ln -nfs $rvm_path/bin/rvmsudo $rvm_symlink_path/rvmsudo
   chmod +x $rvm_symlink_path/rvm
+  chmod +x $rvm_symlink_path/rvmsudo
 fi
 
-#
-# System Checks
-#
+echo -e "\n$(tput setaf 2)rvm$(tput sgr0) - shell scripts that allows a user to manage multiple ruby versions in their own account."
 $rvm_path/scripts/notes
 
-echo -e "    $item In order to use rvm the following line must occur in your shell's loading files, after all path/variable settings:"
-echo -e "\n       if [[ -s $rvm_path/scripts/rvm ]] ; then source $rvm_path/scripts/rvm ; fi"
-echo -e "\n    $item CLOSE THIS SHELL AND OPEN A NEW ONE in order to use rvm."
-
-echo -e "\n$(tput setaf 2)RTFM:\n    $(tput sgr0) http://rvm.beginrescueend.com/ \n"
-echo -e "$(tput setaf 2)w⦿‿⦿t!$(tput sgr0)"
+echo -e "$(tput setaf 2)RTFM: $(tput sgr0) http://rvm.beginrescueend.com/"
+echo -e "\n$(tput setaf 2)HELP: $(tput sgr0) http://webchat.freenode.net/?channels=rvm "
+echo "================================================================================"
+name="$(awk -F= '/^[[:space:]]*name/{print $2}' ~/.gitconfig 2>/dev/null)"
+echo -e "\n${name:-"$(whoami)"},\n"
+echo -e "\nThank you for using rvm. I hope that it makes your work easier and more enjoyable."
+echo -e "If you have any questions, issues and/or ideas for improvement please hop in #rvm on irc.freenode.net and let me know."
+echo -e "My irc nickname is 'wayneeseguin' and I hang out from ~09:00-17:00EST and again from ~21:00EST-~00:00EST."
+echo -e "If I do not respond right away, please hang around after asking your question, I will respond as soon as I am back."
+echo -e "\n  w$(tput setaf 2)⦿‿⦿$(tput sgr0)t!"
 echo -e "\n    ~ Wayne\n"
+echo "================================================================================"
+
+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(.bash_profile and/or .zshenv), 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 "\n3) $(tput setaf 1)CLOSE THIS SHELL$(tput sgr0) and open a new one in order to use rvm.\n"
 
 if [[ -x "$rvm_path/bin/rvm" ]] ; then "$rvm_path/bin/rvm" -v ; fi
 

data/scripts/log

@@ -1,14 +1,29 @@
 #!/usr/bin/env bash
 
+if [[ ! -z "$rvm_trace_flag" ]] ; then set -x ; export rvm_trace_flag ; fi
+
 if [[ ! -z "$2" ]] ; then level=$1 ; shift ; else level="info" ; fi
+
 message=$1
-case "$level" in
-  debug) shift ; echo -e "$(tput setaf 5)<d>$(tput sgr0) $message $(tput setaf 5)</d> $(tput sgr0) "     ;;
-  info)  shift ; echo -e "$(tput setaf 2)<i>$(tput sgr0) $message $(tput setaf 2)</i> $(tput sgr0) "     ;;
-  warn)  shift ; echo -e "$(tput setaf 3)<w>$(tput sgr0) $message $(tput setaf 3)</w> $(tput sgr0) "     ;;
-  error) shift ; echo -e "$(tput setaf 1)<e>$(tput sgr0) $message $(tput setaf 1)</e> $(tput sgr0) " >&2 ;;
-  fail)  shift ; echo -e "$(tput setaf 1)<f>$(tput sgr0) $message $(tput setaf 1)</f> $(tput sgr0) " >&2 ;;
-  *) echo -e "$message"
-esac
+
+if [[ -z "$rvm_interactive" ]] ; then
+  case "$level" in
+    debug) shift ; echo -e "\n$(tput setaf 5)<d>$(tput sgr0) $message $(tput setaf 5)</d> $(tput sgr0) \n"     ;;
+    info)  shift ; echo -e "\n$(tput setaf 2)<i>$(tput sgr0) $message $(tput setaf 2)</i> $(tput sgr0) \n"     ;;
+    warn)  shift ; echo -e "\n$(tput setaf 3)<w>$(tput sgr0) $message $(tput setaf 3)</w> $(tput sgr0) \n"     ;;
+    error) shift ; echo -e "\n$(tput setaf 1)<e>$(tput sgr0) $message $(tput setaf 1)</e> $(tput sgr0) \n" >&2 ;;
+    fail)  shift ; echo -e "\n$(tput setaf 1)<f>$(tput sgr0) $message $(tput setaf 1)</f> $(tput sgr0) \n" >&2 ;;
+    *) echo -e "$message"
+  esac
+else
+  case "$level" in
+    debug) shift ; echo -e "\n$(tput setaf 5)$message$(tput sgr0)\n"     ;;
+    info)  shift ; echo -e "\n$(tput setaf 2)$message$(tput sgr0)\n"     ;;
+    warn)  shift ; echo -e "\n$(tput setaf 3)$message$(tput sgr0)\n"     ;;
+    error) shift ; echo -e "\n$(tput setaf 1)$message$(tput sgr0)\n" >&2 ;;
+    fail)  shift ; echo -e "\n$(tput setaf 1)$message$(tput sgr0)\n" >&2 ;;
+    *) echo -e "$message"
+  esac
+fi
 
 exit 0

data/scripts/manage

@@ -36,11 +36,11 @@ __rvm_install_source() {
 
   if [[ "1.8.5" = "$rvm_ruby_version" ]] ; then
     # How to install ruby 1.8.5... "sneaky sneaky, sir"
-    if [[ ! -d "$HOME/.rvm/src/ruby-1.8.7-p174/ext/openssl/" ]] ; then $rvm_path/bin/rvm fetch 1.8.6-p174 1>/dev/null ; fi
+    if [[ ! -d "$HOME/.rvm/src/ruby-1.8.7-p248/ext/openssl/" ]] ; then $rvm_path/bin/rvm fetch 1.8.6-p248 1>/dev/null ; fi
     if [[ ! -d "$HOME/.rvm/src/ruby-1.8.6-p383/ext/openssl/" ]] ; then $rvm_path/bin/rvm fetch 1.8.6-p383 1>/dev/null ; fi
-    cp ~/.rvm/src/ruby-1.8.7-p174/ext/openssl/extconf.rb ~/.rvm/src/ruby-1.8.5-p231/ext/openssl/
-    cp ~/.rvm/src/ruby-1.8.7-p174/ext/openssl/openssl_missing.* ~/.rvm/src/ruby-1.8.5-p231/ext/openssl/
-    cp ~/.rvm/src/ruby-1.8.7-p174/ext/openssl/ossl_hmac.c ~/.rvm/src/ruby-1.8.5-p231/ext/openssl/
+    cp ~/.rvm/src/ruby-1.8.7-p248/ext/openssl/extconf.rb ~/.rvm/src/ruby-1.8.5-p231/ext/openssl/
+    cp ~/.rvm/src/ruby-1.8.7-p248/ext/openssl/openssl_missing.* ~/.rvm/src/ruby-1.8.5-p231/ext/openssl/
+    cp ~/.rvm/src/ruby-1.8.7-p248/ext/openssl/ossl_hmac.c ~/.rvm/src/ruby-1.8.5-p231/ext/openssl/
     cp ~/.rvm/src/ruby-1.8.6-p383/ext/readline/* ~/.rvm/src/ruby-1.8.5-p231/ext/readline/
   fi
 
@@ -168,7 +168,7 @@ RubyWrapper
         __rvm_rubygems_setup
 
         for rvm_gem_name in rake ; do
-          __rvm_run "gems" "$rvm_ruby_home/bin/gem install $rvm_gem_name --no-rdoc --no-ri -q" "Installing $rvm_gem_name"
+          __rvm_run "gems" "$rvm_ruby_home/bin/gem install $rvm_gem_name $rvm_gem_options" "Installing $rvm_gem_name"
         done
         __rvm_inject_ruby_shebang "$rvm_ruby_gem_home/bin/rake"
         __rvm_inject_gem_env "$rvm_ruby_gem_home/bin/rake"
@@ -320,7 +320,7 @@ RubyWrapper
       __rvm_use
 
       for rvm_gem_name in jruby-openssl ; do
-        __rvm_run "gems" "$rvm_ruby_home/bin/gem install $rvm_gem_name --no-rdoc --no-ri -q" "Installing $rvm_gem_name"
+        __rvm_run "gems" "$rvm_ruby_home/bin/gem install $rvm_gem_name $rvm_gem_options" "Installing $rvm_gem_name"
       done ; unset rvm_gem_name
     ;;
 
@@ -595,7 +595,7 @@ __rvm_post_install() {
   $rvm_scripts_path/log "info" "Installing gems for $rvm_ruby_string."
 
   for rvm_gem_name in rake ; do
-    __rvm_run "gems.install" "$rvm_ruby_home/bin/gem install $rvm_gem_name --no-rdoc --no-ri -q" "Installing $rvm_gem_name"
+    __rvm_run "gems.install" "$rvm_ruby_home/bin/gem install $rvm_gem_name $rvm_gem_options" "Installing $rvm_gem_name"
   done ; unset rvm_gem_name
 
   $rvm_scripts_path/log "info" "Installation of gems for $rvm_ruby_string is complete."

data/scripts/notes

@@ -4,9 +4,9 @@ system="$(uname)"
 
 item="$(tput setaf 2)* $(tput sgr0)"
 
-echo -e "\n$(tput setaf 2)rvm notes for $system $(tput sgr0)\n"
+echo -e "\n$(tput setaf 2)${system} Notes:$(tput sgr0)\n"
 
-echo -e "    $item curl is required, be sure it is installed.\n"
+echo -e "    $item curl is required.\n"
 
 if [[ "Linux" = "$system" ]] ; then
   rvm_apt_get_binary="$(which aptitude 2> /dev/null)"
@@ -18,7 +18,7 @@ if [[ "Linux" = "$system" ]] ; 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"
+    echo -e "\n       $ aptitude install curl bison build-essential zlib1g-dev libssl-dev libreadline5-dev libxml2-dev git-core"
     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"
 
@@ -46,9 +46,9 @@ if [[ "Linux" = "$system" ]] ; then
   fi
 elif [[ "Darwin" = "$system"  ]] ; then
   echo -e "    $item For Snow Leopard be sure to have XCode Tools Version 3.2.1 (1613) or later (there were bugs with the dvd release version)."
-  echo -e "\n    $item You should download the latest XCode tools from developer.apple.com. This will be necessary with the dvd install for Snow Leopard which has bugs."
+  echo -e "\n    $item You should download the latest XCode tools from developer.apple.com. This is necessary since the dvd install for Snow Leopard has bugs."
   echo -e "\n    $item If you intend on installing MacRuby you must install LLVM first."
-  echo -e "\n    $item If you intend on installing JRuby you must install Java. The JDK is recommended."
+  echo -e "\n    $item If you intend on installing JRuby you must install the JDK."
   echo -e "\n    $item If you intend on installing IronRuby you must install Mono (version 2.6 or greater is recommended)."
 fi
 

data/scripts/rvm

@@ -15,8 +15,9 @@ if [[ "$rvm_loaded_flag" != "1" ]] || [[ "$rvm_reload_flag" = "1" ]] ; then
     if [[ "root" = "$(whoami)" ]] ; then
       rvm_path="/usr/local/rvm"
     else
-      if [[ -d "$HOME/.rvm" ]] ; then rvm_path="$HOME/.rvm" ; fi
-      if [[ -d "/usr/local/rvm" ]] && [[ -s "/usr/local/rvm/scripts/rvm" ]] ; then
+      if [[ -d "$HOME/.rvm" ]] && [[ -s "$HOME/.rvm/scripts/rvm" ]]; then
+        rvm_path="$HOME/.rvm"
+      elif [[ -d "/usr/local/rvm" ]] && [[ -s "/usr/local/rvm/scripts/rvm" ]] ; then
         rvm_path="${rvm_path:-"/usr/local/rvm"}"
       fi
     fi
@@ -41,6 +42,8 @@ if [[ "$rvm_loaded_flag" != "1" ]] || [[ "$rvm_reload_flag" = "1" ]] ; then
       source "$HOME/.rvm/default"
     elif [[ -s "$rvm_path/default" ]] ; then
       source "$rvm_path/default"
+    elif [[ -s "/usr/local/rvm/default" ]] ; then
+      source "/usr/local/rvm/default"
     fi
   else
     echo -e "\$rvm_path is not set. rvm cannot load."

data/scripts/rvm-install

@@ -1,5 +1,7 @@
 #!/usr/bin/env bash
 
+if [[ "--auto" = "$1" ]] ; then rvm_auto_flag=1 ; else unset rvm_auto_flag ; fi
+
 if [[ -f /etc/rvmrc ]] ; then source /etc/rvmrc ; fi
 if [[ -f "$HOME/.rvmrc" ]] ; then source "$HOME/.rvmrc" ; fi
 
@@ -15,6 +17,8 @@ fi
 source scripts/utility
 source scripts/initialize
 
+__rvm_initialize
+
 #
 # Setup
 #
@@ -26,8 +30,7 @@ if [[ ! -d "$source_dir" ]] ; then unset source_dir ; fi
 source_dir="${source_dir:-$cwd}"
 
 # State what is required to use rvm
-echo -e "\n$(tput setaf 2)rvm$(tput sgr0) - shell scripts that allows a user to manage multiple ruby versions in their own account."
-echo -e "\n    Prepairing $rvm_path ..."
+echo -e "\nInstalling rvm to $rvm_path/ ..."
 for dir_name in src scripts bin log archives config gems examples ; do
   mkdir -p "$rvm_path/$dir_name"
 done
@@ -36,7 +39,6 @@ cp -f "$source_dir/README" "$rvm_path/"
 #
 # Scripts
 #
-echo -e "\n    Installing rvm to $rvm_path/ ..."
 rm -rf $rvm_path/scripts # Clear the old scripts directory so that the old style rvm- scripts are cleared out.
 for dir_name in config scripts examples lib hooks ; do
   mkdir -p "$rvm_path/$dir_name"
@@ -52,7 +54,6 @@ fi
 #
 # Bin Scripts
 #
-echo -e "\n    Installing bin scripts to $rvm_path/bin ..."
 # Cleanse and purge...
 rm -f $rvm_path/bin/rvm ; rm -rf $rvm_path/bin/binscripts
 for file in rvm-prompt rvm rvmsudo ; do
@@ -63,42 +64,55 @@ chmod +x $rvm_path/bin/*
 #
 # RC Files
 #
-echo -e "\n    Checking rc files ($rvm_rc_files) ..."
-if [[ "$rvm_loaded_flag" != "1" ]] ; then
-  for rcfile in $(echo $rvm_rc_files) ; do
-    if [[ ! -f $rcfile ]] ; then touch $rcfile ; fi
-    if [[ -s "$HOME/.profile" ]] ; then
-      if ! grep -q '.profile' "$rcfile" ; then
-        echo "    Adding 'if [[ -s \$HOME/.profile ]] ; then source \$HOME ; fi' to $rcfile."
-        echo -e "\n# rvm-install added line:\nif [[ -s \$HOME/.profile ]] ; then source \$HOME/.profile ; fi\n" >> $rcfile
+if [[ ! -z "$rvm_auto_flag" ]] ; then
+  echo -e "Checking rc files... ($rvm_rc_files)"
+  if [[ "$rvm_loaded_flag" != "1" ]] ; then
+    for rcfile in $(echo $rvm_rc_files) ; do
+      if [[ ! -f $rcfile ]] ; then touch $rcfile ; fi
+      if [[ -s "$HOME/.profile" ]] ; then
+        if ! grep -q '.profile' "$rcfile" ; then
+          echo "    Adding 'if [[ -s \$HOME/.profile ]] ; then source \$HOME ; fi' to $rcfile."
+          echo -e "\n# rvm-install added line:\nif [[ -s \$HOME/.profile ]] ; then source \$HOME/.profile ; fi\n" >> $rcfile
+        fi
       fi
-    fi
-    if ! grep -q "scripts\/rvm" "$rcfile" ; then
-      echo "    Adding 'if [[ -s $rvm_path/scripts/rvm ]] ; then source $rvm_path/scripts/rvm ; fi' to $rcfile."
-      echo -e "\n# rvm-install added:\nif [[ -s $rvm_path/scripts/rvm ]] ; then source $rvm_path/scripts/rvm ; fi\n" >> $rcfile
-    fi
-  done
+      if ! grep -q "scripts\/rvm" "$rcfile" ; then
+        echo "    Adding 'if [[ -s $rvm_path/scripts/rvm ]] ; then source $rvm_path/scripts/rvm ; fi' to $rcfile."
+        echo -e "\n# rvm-install added:\nif [[ -s $rvm_path/scripts/rvm ]] ; then source $rvm_path/scripts/rvm ; fi\n" >> $rcfile
+      fi
+    done
+  fi
 fi
 
 if [[ "root" = "$(whoami)" ]] ; then
   echo -e "\n    Symlinking rvm to $rvm_symlink_path/rvm ..."
   mkdir -p $rvm_symlink_path
   ln -nfs $rvm_path/bin/rvm $rvm_symlink_path/rvm
+  ln -nfs $rvm_path/bin/rvmsudo $rvm_symlink_path/rvmsudo
   chmod +x $rvm_symlink_path/rvm
+  chmod +x $rvm_symlink_path/rvmsudo
 fi
 
-#
-# System Checks
-#
+echo -e "\n$(tput setaf 2)rvm$(tput sgr0) - shell scripts that allows a user to manage multiple ruby versions in their own account."
 $rvm_path/scripts/notes
 
-echo -e "    $item In order to use rvm the following line must occur in your shell's loading files, after all path/variable settings:"
-echo -e "\n       if [[ -s $rvm_path/scripts/rvm ]] ; then source $rvm_path/scripts/rvm ; fi"
-echo -e "\n    $item CLOSE THIS SHELL AND OPEN A NEW ONE in order to use rvm."
-
-echo -e "\n$(tput setaf 2)RTFM:\n    $(tput sgr0) http://rvm.beginrescueend.com/ \n"
-echo -e "$(tput setaf 2)w⦿‿⦿t!$(tput sgr0)"
+echo -e "$(tput setaf 2)RTFM: $(tput sgr0) http://rvm.beginrescueend.com/"
+echo -e "\n$(tput setaf 2)HELP: $(tput sgr0) http://webchat.freenode.net/?channels=rvm "
+echo "================================================================================"
+name="$(awk -F= '/^[[:space:]]*name/{print $2}' ~/.gitconfig 2>/dev/null)"
+echo -e "\n${name:-"$(whoami)"},\n"
+echo -e "\nThank you for using rvm. I hope that it makes your work easier and more enjoyable."
+echo -e "If you have any questions, issues and/or ideas for improvement please hop in #rvm on irc.freenode.net and let me know."
+echo -e "My irc nickname is 'wayneeseguin' and I hang out from ~09:00-17:00EST and again from ~21:00EST-~00:00EST."
+echo -e "If I do not respond right away, please hang around after asking your question, I will respond as soon as I am back."
+echo -e "\n  w$(tput setaf 2)⦿‿⦿$(tput sgr0)t!"
 echo -e "\n    ~ Wayne\n"
+echo "================================================================================"
+
+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(.bash_profile and/or .zshenv), 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 "\n3) $(tput setaf 1)CLOSE THIS SHELL$(tput sgr0) and open a new one in order to use rvm.\n"
 
 if [[ -x "$rvm_path/bin/rvm" ]] ; then "$rvm_path/bin/rvm" -v ; fi
 

data/scripts/selector

@@ -269,28 +269,28 @@ __rvm_use() {
         rm -f $rvm_symlink_path/passenger_ruby
         ln -nfs $rvm_bin_path/$rvm_ruby_string $rvm_symlink_path/passenger_ruby
       done
+    fi
+
+    if [[ "system" = "$rvm_ruby_interpreter" ]] ; then
+      rm -f $rvm_path/default
+      rm -f $rvm_path/bin/default*
     else
-      if [[ "system" = "$rvm_ruby_interpreter" ]] ; then
-        rm -f $rvm_path/default
-        rm -f $rvm_path/bin/default*
-      else
-        RUBY_VERSION="$($MY_RUBY_HOME/bin/ruby -v | sed 's#^\(.*\) (.*$#\1#')"
-        export GEM_HOME GEM_PATH MY_RUBY_HOME RUBY_VERSION
-
-        echo "PATH=$MY_RUBY_HOME/bin:$GEM_HOME/bin:$rvm_path/bin:\$PATH ; export PATH" > $rvm_path/default
-
-        for variable in RUBY_VERSION GEM_HOME GEM_PATH MY_RUBY_HOME IRBRC rvm_ruby_string rvm_gem_set_name; do
-          eval "export $variable"
-          eval value=\$${variable}
-          if [[ ! -z "$value" ]] ; then
-            echo "${variable}='$value' ; export ${variable}" >> $rvm_path/default
-          else
-            echo "unset ${variable}" >> $rvm_path/default
-          fi
-        done ; unset variable value
-
-        if [[ ! -z "$rvm_default_flag" ]] ; then $rvm_scripts_path/symlink "default" ; fi
-      fi
+      RUBY_VERSION="$($MY_RUBY_HOME/bin/ruby -v | sed 's#^\(.*\) (.*$#\1#')"
+      export GEM_HOME GEM_PATH MY_RUBY_HOME RUBY_VERSION
+
+      echo "PATH=$MY_RUBY_HOME/bin:$GEM_HOME/bin:$rvm_path/bin:\$PATH ; export PATH" > $rvm_path/default
+
+      for variable in RUBY_VERSION GEM_HOME GEM_PATH MY_RUBY_HOME IRBRC rvm_ruby_string rvm_gem_set_name; do
+        eval "export $variable"
+        eval value=\$${variable}
+        if [[ ! -z "$value" ]] ; then
+          echo "${variable}='$value' ; export ${variable}" >> $rvm_path/default
+        else
+          echo "unset ${variable}" >> $rvm_path/default
+        fi
+      done ; unset variable value
+
+      if [[ ! -z "$rvm_default_flag" ]] ; then $rvm_scripts_path/symlink "default" ; fi
     fi
   fi
   unset rvm_default_flag
@@ -307,7 +307,7 @@ __rvm_use() {
     export PATH="$new_path" ; unset new_path
   fi
 
-  __rvm_hook "after_use"
+  $rvm_scripts_path/hook "after_use"
 }
 
 __rvm_ruby_string() {

data/scripts/update

@@ -1,5 +1,7 @@
 #!/usr/bin/env bash
 
+if [[ "--auto" = "$1" ]] ; then rvm_auto_flag=1 ; else unset rvm_auto_flag ; fi
+
 if [[ -f /etc/rvmrc ]] ; then source /etc/rvmrc ; fi
 if [[ -f "$HOME/.rvmrc" ]] ; then source "$HOME/.rvmrc" ; fi
 
@@ -15,6 +17,8 @@ fi
 source scripts/utility
 source scripts/initialize
 
+__rvm_initialize
+
 #
 # Setup
 #
@@ -26,8 +30,7 @@ if [[ ! -d "$source_dir" ]] ; then unset source_dir ; fi
 source_dir="${source_dir:-$cwd}"
 
 # State what is required to use rvm
-echo -e "\n$(tput setaf 2)rvm$(tput sgr0) - shell scripts that allows a user to manage multiple ruby versions in their own account."
-echo -e "\n    Prepairing $rvm_path ..."
+echo -e "\nInstalling rvm to $rvm_path/ ..."
 for dir_name in src scripts bin log archives config gems examples ; do
   mkdir -p "$rvm_path/$dir_name"
 done
@@ -36,7 +39,6 @@ cp -f "$source_dir/README" "$rvm_path/"
 #
 # Scripts
 #
-echo -e "\n    Installing rvm to $rvm_path/ ..."
 rm -rf $rvm_path/scripts # Clear the old scripts directory so that the old style rvm- scripts are cleared out.
 for dir_name in config scripts examples lib hooks ; do
   mkdir -p "$rvm_path/$dir_name"
@@ -52,7 +54,6 @@ fi
 #
 # Bin Scripts
 #
-echo -e "\n    Installing bin scripts to $rvm_path/bin ..."
 # Cleanse and purge...
 rm -f $rvm_path/bin/rvm ; rm -rf $rvm_path/bin/binscripts
 for file in rvm-prompt rvm rvmsudo ; do
@@ -63,42 +64,55 @@ chmod +x $rvm_path/bin/*
 #
 # RC Files
 #
-echo -e "\n    Checking rc files ($rvm_rc_files) ..."
-if [[ "$rvm_loaded_flag" != "1" ]] ; then
-  for rcfile in $(echo $rvm_rc_files) ; do
-    if [[ ! -f $rcfile ]] ; then touch $rcfile ; fi
-    if [[ -s "$HOME/.profile" ]] ; then
-      if ! grep -q '.profile' "$rcfile" ; then
-        echo "    Adding 'if [[ -s \$HOME/.profile ]] ; then source \$HOME ; fi' to $rcfile."
-        echo -e "\n# rvm-install added line:\nif [[ -s \$HOME/.profile ]] ; then source \$HOME/.profile ; fi\n" >> $rcfile
+if [[ ! -z "$rvm_auto_flag" ]] ; then
+  echo -e "Checking rc files... ($rvm_rc_files)"
+  if [[ "$rvm_loaded_flag" != "1" ]] ; then
+    for rcfile in $(echo $rvm_rc_files) ; do
+      if [[ ! -f $rcfile ]] ; then touch $rcfile ; fi
+      if [[ -s "$HOME/.profile" ]] ; then
+        if ! grep -q '.profile' "$rcfile" ; then
+          echo "    Adding 'if [[ -s \$HOME/.profile ]] ; then source \$HOME ; fi' to $rcfile."
+          echo -e "\n# rvm-install added line:\nif [[ -s \$HOME/.profile ]] ; then source \$HOME/.profile ; fi\n" >> $rcfile
+        fi
       fi
-    fi
-    if ! grep -q "scripts\/rvm" "$rcfile" ; then
-      echo "    Adding 'if [[ -s $rvm_path/scripts/rvm ]] ; then source $rvm_path/scripts/rvm ; fi' to $rcfile."
-      echo -e "\n# rvm-install added:\nif [[ -s $rvm_path/scripts/rvm ]] ; then source $rvm_path/scripts/rvm ; fi\n" >> $rcfile
-    fi
-  done
+      if ! grep -q "scripts\/rvm" "$rcfile" ; then
+        echo "    Adding 'if [[ -s $rvm_path/scripts/rvm ]] ; then source $rvm_path/scripts/rvm ; fi' to $rcfile."
+        echo -e "\n# rvm-install added:\nif [[ -s $rvm_path/scripts/rvm ]] ; then source $rvm_path/scripts/rvm ; fi\n" >> $rcfile
+      fi
+    done
+  fi
 fi
 
 if [[ "root" = "$(whoami)" ]] ; then
   echo -e "\n    Symlinking rvm to $rvm_symlink_path/rvm ..."
   mkdir -p $rvm_symlink_path
   ln -nfs $rvm_path/bin/rvm $rvm_symlink_path/rvm
+  ln -nfs $rvm_path/bin/rvmsudo $rvm_symlink_path/rvmsudo
   chmod +x $rvm_symlink_path/rvm
+  chmod +x $rvm_symlink_path/rvmsudo
 fi
 
-#
-# System Checks
-#
+echo -e "\n$(tput setaf 2)rvm$(tput sgr0) - shell scripts that allows a user to manage multiple ruby versions in their own account."
 $rvm_path/scripts/notes
 
-echo -e "    $item In order to use rvm the following line must occur in your shell's loading files, after all path/variable settings:"
-echo -e "\n       if [[ -s $rvm_path/scripts/rvm ]] ; then source $rvm_path/scripts/rvm ; fi"
-echo -e "\n    $item CLOSE THIS SHELL AND OPEN A NEW ONE in order to use rvm."
-
-echo -e "\n$(tput setaf 2)RTFM:\n    $(tput sgr0) http://rvm.beginrescueend.com/ \n"
-echo -e "$(tput setaf 2)w⦿‿⦿t!$(tput sgr0)"
+echo -e "$(tput setaf 2)RTFM: $(tput sgr0) http://rvm.beginrescueend.com/"
+echo -e "\n$(tput setaf 2)HELP: $(tput sgr0) http://webchat.freenode.net/?channels=rvm "
+echo "================================================================================"
+name="$(awk -F= '/^[[:space:]]*name/{print $2}' ~/.gitconfig 2>/dev/null)"
+echo -e "\n${name:-"$(whoami)"},\n"
+echo -e "\nThank you for using rvm. I hope that it makes your work easier and more enjoyable."
+echo -e "If you have any questions, issues and/or ideas for improvement please hop in #rvm on irc.freenode.net and let me know."
+echo -e "My irc nickname is 'wayneeseguin' and I hang out from ~09:00-17:00EST and again from ~21:00EST-~00:00EST."
+echo -e "If I do not respond right away, please hang around after asking your question, I will respond as soon as I am back."
+echo -e "\n  w$(tput setaf 2)⦿‿⦿$(tput sgr0)t!"
 echo -e "\n    ~ Wayne\n"
+echo "================================================================================"
+
+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(.bash_profile and/or .zshenv), 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 "\n3) $(tput setaf 1)CLOSE THIS SHELL$(tput sgr0) and open a new one in order to use rvm.\n"
 
 if [[ -x "$rvm_path/bin/rvm" ]] ; then "$rvm_path/bin/rvm" -v ; fi
 

data/scripts/utility

@@ -109,7 +109,7 @@ __rvm_remove_rvm_from_path() {
   export PATH
 }
 
-__rvm_gi() { gem install -q --no-rdoc --no-ri $* ; }
+__rvm_gi() { gem install $rvm_gem_options $* ; }
 
 __rvm_run() {
   log_file_name="$1" ; command="$2" ; message="$3"
@@ -269,6 +269,7 @@ __rvm_source_dir() {
 }
 
 __rvm_list() {
+  echo
   if [[ ! -z "$rvm_all_flag" ]] ; then
     while read -r tag
     do
@@ -276,7 +277,7 @@ __rvm_list() {
       echo "${prefix}-t${tag/\//}"
       unset prefix tag
     done < <(svn list http://svn.ruby-lang.org/repos/ruby/tags/ | awk '/^v1_[8|9]/')
-    echo -e "(ruby-)1.8.6(-p383)\n(ruby-)1.8.6-head\n(ruby-)1.8.7(-p174)\n(ruby-)1.8.7-head\n(ruby-)1.9.1(-p243)\n(ruby-)1.9.1(-p376)\n(ruby-)1.9.1-head\n(ruby-)1.9.2-preview1"
+    echo -e "(ruby-)1.8.6(-p383)\n(ruby-)1.8.6-head\n(ruby-)1.8.7(-p248)\n(ruby-)1.8.7-head\n(ruby-)1.9.1(-p243)\n(ruby-)1.9.1(-p376)\n(ruby-)1.9.1-head\n(ruby-)1.9.2-preview1"
     echo -e "jruby-1.2.0\njruby-1.3.0\njruby-1.3.1\njruby(-1.4.0) # the default\njruby-head"
     echo -e "rbx(-head) # rubinius head, the default rbx \nrbx(-head) --jit (rubinius head with LLVM enabled)"
     echo -e "ree-1.8.6\nree(-1.8.7) # the default\nree-1.8.6-head\nree-1.8.7-head"
@@ -293,7 +294,7 @@ __rvm_list() {
 
     for version in $(\ls $rvm_path/ 2> /dev/null | awk '/[a-z]*-.*/ {print $NF}') ; do
       if [[ ! -z "$(echo $version | awk '/^jruby-/')" ]] ; then
-        string="$($version -v | awk '{print $NF}')"
+        string="$($rvm_path/$version/bin/ruby -v | awk '{print $NF}')"
       else
         string="[ $(file $rvm_path/$version/bin/ruby | awk '/x86.64/ {print "x86_64"} /386/ {print "i386"} /ppc/ {print "ppc"}' | tr "\n" ' ')]"
       fi
@@ -324,9 +325,9 @@ __rvm_list() {
       system_version=$($system_ruby -v)
       string="[ $(file $system_ruby | awk '/x86.64/ {print "x86_64"} /386/ {print "i386"} /ppc/ {print "ppc"}' | tr "\n" ' ')]"
       if [[ ! -z "$system_ruby" ]] && [[ "$system_ruby -v)" = "$system_version" ]] ; then
-        echo -e "=> $(tput setaf 2)system$(tput sgr0) $string\n"
+        echo -e "=> $(tput setaf 2)system$(tput sgr0) $string"
       else
-        echo -e "   $(tput setaf 2)system$(tput sgr0) $string\n"
+        echo -e "   $(tput setaf 2)system$(tput sgr0) $string"
       fi
     else
       $rvm_scripts_path/log "info" "No system ruby found."
@@ -334,6 +335,7 @@ __rvm_list() {
 
     unset current_ruby version selected system_ruby system_version string
   fi
+  echo
 }
 
 __rvm_initialize() {
@@ -350,6 +352,7 @@ __rvm_initialize() {
 }
 
 __rvm_update() {
+  __rvm_pushpop $rvm_path
   if [[ "head" = "$rvm_ruby_revision" ]] || [[ ! -z "$rvm_self_flag" ]] || [[ "update" = "$rvm_action" ]] || [[ ! -z "$rvm_update_flag" ]] ; then
     __rvm_version
     __rvm_update_rvm
@@ -358,6 +361,7 @@ __rvm_update() {
   if [[ ! -z "$rvm_rubygems_flag" ]] ; then __rvm_rubygems_setup ; fi
 
   unset rvm_update_flag rvm_action rvm_self_flag rvm_ruby_revision rvm_bin_flag rvm_rubygems_flag
+  __rvm_pushpop
 }
 
 __rvm_update_rvm() {
@@ -382,16 +386,16 @@ __rvm_update_rvm() {
     fi
   else
     if [[ "true" = "$($ruby -S gem list rvm --installed)" ]]; then
-      $ruby -S gem update rvm --no-rdoc --no-ri --quiet
+      $ruby -S gem update rvm $rvm_gem_options
     else
-      $ruby -S gem install rvm --no-rdoc --no-ri --quiet
+      $ruby -S gem install rvm $rvm_gem_options
     fi
     # TODO: Check all gem paths instead of simply assuming the last one...
     builtin cd "$($ruby -S gem env | grep "\- $HOME" | awk '{print $NF}' | head -n 1)/gems/rvm-$(gem list rvm | sed 's/.*(//' | sed 's/).*//' | awk -F',' '{print $1 ; exit}')" && ./install
   fi
   unset ruby system_ruby
   __rvm_pushpop
-  __rvm_hook "after_update"
+  $rvm_scripts_path/hook "after_update"
 }
 
 __rvm_reboot() {
@@ -406,7 +410,7 @@ __rvm_reboot() {
     else
       if [[ -d "$rvm_path" ]] ; then rm -rf "$rvm_path/" ; fi
     fi
-    gem install rvm --no-rdoc --no-ri -q
+    gem install rvm $rvm_gem_options
     __rvm_update_rvm
     source $rvm_path/scripts/rvm
   else
@@ -448,17 +452,17 @@ __rvm_ruby_do() {
   elif [[ "gem" = "$(basename $binary)" ]] && $rvm_scripts_path/match "$rvm_ruby_args" '^install' ; then
     #__rvm_gem_install
     #$rvm_scripts_path/gem install $rvm_ruby_args
-    rvm_command="$rvm_scripts_path/gems $rvm_ruby_mode $rvm_ruby_args --no-rdoc --no-ri"
+    rvm_command="$rvm_scripts_path/gems $rvm_ruby_mode $rvm_ruby_args $rvm_gem_options"
   else
     rvm_command="$binary $rvm_ruby_mode $rvm_ruby_args"
   fi
 
-  mkdir -p ./log/$rvm_ruby_string/
   if [[ ! -z "$rvm_json_flag" ]] || [[ ! -z "$rvm_yaml_flag" ]] || [[ ! -z "$rvm_summary_flag" ]] ; then
+    mkdir -p ./log/$rvm_ruby_string/
     touch ./log/$rvm_ruby_string/$rvm_action.log ./log/$rvm_ruby_string/$rvm_action.error.log
     eval "$rvm_command" >> ./log/$rvm_ruby_string/$rvm_action.log 2>> ./log/$rvm_ruby_string/$rvm_action.error.log
   else
-    echo -e "\n\n\033[0;32m$rvm_ruby_string: $($binary -v $rvm_ruby_mode | tr "\n" ' ')\033[0m\n"
+    $rvm_scripts_path/log "info" "$rvm_ruby_string: $($rvm_ruby_home/bin/ruby -v $rvm_ruby_mode | tr "\n" ' ')"
     eval "$rvm_command"
   fi
   result=$?
@@ -503,7 +507,7 @@ __rvm_do() {
 
   __rvm_state
 
-  __rvm_hook "after_do"
+  $rvm_scripts_path/hook "after_do"
 
   return ${#errors[*]}
 }
@@ -659,15 +663,6 @@ __rvm_make_flags() {
   fi
 }
 
-__rvm_hook() {
-  if [[ ! -z "$1" ]] ; then
-    if [[ -s "$rvm_hooks_path/$1" ]] ; then
-      if [[ "$rvm_verbose_flag" -eq 1 ]] || [[ "$rvm_debug_flag" -eq 1 ]] ; then $rvm_scripts_path/log "info" "running hook $1" ; fi
-      source "$rvm_hooks_path/$1"
-    fi
-  fi
-}
-
 __rvm_gems_select() {
   if [[ -z "$(which gem 2>/dev/null)" ]] ; then return 0 ; fi
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rvm
 version: !ruby/object:Gem::Version 
-  version: 0.0.98
+  version: 0.0.99
 platform: ruby
 authors: 
 - Wayne E. Seguin
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-21 00:00:00 -05:00
+date: 2009-12-27 00:00:00 -05:00
 default_executable: rvm-install
 dependencies: []
 
@@ -49,6 +49,7 @@ files:
 - scripts/functions
 - scripts/gems
 - scripts/hash
+- scripts/hook
 - scripts/initialize
 - scripts/install
 - scripts/irbrc