rvm 0.0.55 → 0.0.56

data/scripts/rvm

@@ -13,6 +13,7 @@ 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
+source $rvm_path/scripts/gems
 
 rvm_loaded_flag=1 ; export rvm_loaded_flag
 

data/scripts/rvm-install

@@ -21,6 +21,7 @@ for dir_name in src scripts bin log archives config gems examples ; do
   mkdir -p $rvm_path/$dir_name
 done
 
+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 ; do
   mkdir -p $rvm_path/$dir_name
   /bin/cp -Rf $source_dir/$dir_name $rvm_path

data/scripts/selector

@@ -28,7 +28,7 @@ function __rvm_select {
     macruby)
       if [ "`uname`" = "Darwin" ] ; then
         rvm_ruby_repo_url="${rvm_ruby_repo_url:-`__rvm_db "macruby_repo_url"`}"
-        rvm_ruby_version="head"
+        rvm_ruby_version="${rvm_ruby_version:-head}"
         rvm_ruby_package_name=${rvm_ruby_interpreter}-${rvm_ruby_version}
         #rvm_ruby_version="${rvm_ruby_version:-`__rvm_db "macruby_version"`}"
         #rvm_ruby_package_name=${rvm_ruby_interpreter}_nightly-${rvm_ruby_version}
@@ -40,15 +40,15 @@ function __rvm_select {
     ;;
 
     rbx|rubinius)
-      rvm_ruby_version="head"
+      rvm_ruby_interpreter="rbx"
+      rvm_ruby_version="${rvm_ruby_version:-head}"
+      #rvm_ruby_revision="head"
       unset rvm_ruby_patch_level
-      rvm_ruby_interpreter="rubinius"
       rvm_ruby_repo_url=${rvm_rbx_repo_url:-`__rvm_db "rubinius_repo_url"`}
       rvm_url=$rvm_ruby_repo_url
       rvm_ruby_configure=""
       rvm_ruby_make="build"
       rvm_ruby_make_install=""
-      #rvm_ruby_rev="head"
     ;;
 
     jruby)
@@ -70,11 +70,11 @@ function __rvm_select {
     ;;
 
     ruby-enterprise|ree)
-      rvm_ruby_interpreter="ree"
-      rvm_ruby_interpreter=`__rvm_db "ree_interpreter"`
+      rvm_ruby_interpreter=ree
       rvm_ruby_version=${rvm_ruby_version:-`__rvm_db "ree_version"`}
-      rvm_ruby_patch_level="${3:-`__rvm_db "ree_${rvm_ruby_version}_patch_level"`}"
-      rvm_ruby_package_name="ruby-enterprise-$rvm_ruby_version-$rvm_ruby_patch_level"
+      rvm_ruby_patch_level="${rvm_ruby_revision:-`__rvm_db "ree_${rvm_ruby_version}_patch_level"`}"
+      rvm_ruby_package_name="ree-$rvm_ruby_version-$rvm_ruby_patch_level"
+      rvm_ruby_package_file="ruby-enterprise-$rvm_ruby_version-$rvm_ruby_patch_level"
       if [ -z "$(echo $rvm_ruby_version | awk '/^1\.8/')" ] ; then
         __rvm_log "fail" "Unknown Ruby Enterprise Edition version: $rvm_ruby_version"
       fi
@@ -86,11 +86,10 @@ function __rvm_select {
         rvm_ruby_patch_level=$rvm_ruby_tag # $(echo $rvm_ruby_tag | sed 's/^v//' | sed 's/\///' | awk -F'_' '{print $4 }')
       fi
       if [ -z "$rvm_ruby_version" ] ; then
-        rvm_ruby_version=`__rvm_db "ruby_version"` # Default verison is 1.8.6
+        rvm_ruby_version=$(__rvm_db "ruby_version") # Default verison is 1.8.6
       fi
-      rvm_ruby_patch_level=${rvm_ruby_patch_level:-`__rvm_db "ruby_${rvm_ruby_version}_patch_level"`} # Default verison is 1.8.6
+      rvm_ruby_patch_level=${rvm_ruby_patch_level:-$(__rvm_db "ruby_${rvm_ruby_version}_patch_level")} # Default verison is 1.8.6
       if [ -z "rvm_ruby_patch_level" ] ; then unset rvm_ruby_patch_level ; fi
-
       if [ -z "rvm_ruby_version" ] ; then
         __rvm_log "fail" "Unknown ruby version: $rvm_ruby_version"
       fi
@@ -109,45 +108,27 @@ function __rvm_select {
       fi
   esac
 
-  if [ ! -z "$rvm_ruby_rev" ] ; then
-    if [ "$rvm_ruby_rev" = "head" -o "$rvm_ruby_rev" = "trunk" ] ; then
+  if [ ! -z "$rvm_ruby_revision" ] ; then
+    if [ "$rvm_ruby_revision" = "head" -o "$rvm_ruby_revision" = "trunk" ] ; then
       rvm_ruby_patch_level="head"
     else
-      rvm_ruby_patch_level="$rvm_ruby_rev"
+      rvm_ruby_patch_level="$rvm_ruby_revision"
     fi
   fi
 
-  if [ -z "$rvm_gem_set_name" ] ; then
-    gemset=$(gem env gemdir | xargs basename | sed "s/${rvm_ruby_version}-//")
-    if [ "$gemset" != "$rvm_ruby_version" -a -z "$(echo $gemset | awk '/^[0-9]/')" ] ; then
-      rvm_gem_set_name="$gemset"
-    else
-      unset rvm_gem_set_name
-    fi ; unset gemset
-  fi
+  __rvm_gems_select
 
   if [ ! -z "$rvm_ruby_interpreter" -a ! -z "$rvm_ruby_version" -a "$rvm_ruby_interpreter" != "system" ] ; then
     rvm_major_version=$(echo $rvm_ruby_version | awk -F'.' '{ print $2 }')
     rvm_minor_version=$(echo $rvm_ruby_version | awk -F'.' '{ print $3 }')
 
-    if [ -z "$rvm_gem_set_name" ] ; then
-      rvm_gem_home="$rvm_gem_path/$rvm_ruby_interpreter/$rvm_ruby_version"
-    else
-      if [ ! -z "$rvm_gem_set_name_rm" -a -d $rvm_gem_path/$rvm_ruby_interpreter/$rvm_ruby_version-$rvm_gem_set_name ] ; then
-        rm -rf $rvm_gem_path/$rvm_ruby_interpreter/$rvm_ruby_version-$rvm_gem_set_name/
-        if [ "$rvm_gem_set_name_rm" = "$rvm_gem_set_name" ] ; then unset rvm_gem_set_name ; fi
-      else
-        rvm_gem_home="$rvm_gem_path/$rvm_ruby_interpreter/$rvm_ruby_version-$rvm_gem_set_name"
-      fi
-    fi
-
-    mkdir -p $rvm_gem_home
+    __rvm_gems_select
 
     if [ -z "$rvm_ruby_patch_level" ] ; then
       rvm_ruby_package_name="${rvm_ruby_package_name:-"$rvm_ruby_interpreter-$rvm_ruby_version"}"
       rvm_ruby_home="${rvm_ruby_home:-"$rvm_path/$rvm_ruby_interpreter-$rvm_ruby_version"}"
     else
-      if [ "$rvm_ruby_interpreter" != "ruby-enterprise" ] ; then
+      if [ "$rvm_ruby_interpreter" != "ree" ] ; then
         if [ ! -z "`echo $rvm_ruby_patch_level | awk '/^[0-9]/'`" ] ; then
           rvm_ruby_patch_level="p$rvm_ruby_patch_level"
         fi
@@ -156,21 +137,22 @@ function __rvm_select {
       rvm_ruby_package_name="${rvm_ruby_package_name:-"$rvm_ruby_interpreter-$rvm_ruby_version-$rvm_ruby_patch_level"}"
       rvm_ruby_home="${rvm_ruby_home:-"$rvm_path/$rvm_ruby_interpreter-$rvm_ruby_version-$rvm_ruby_patch_level"}"
     fi
+
     rvm_ruby_string="$rvm_ruby_package_name"
     rvm_ruby_log_path="$rvm_log_path/$rvm_ruby_package_name"
-    rvm_ruby_src_path="$rvm_source_path/$rvm_ruby_string"
+    rvm_ruby_src_path="$rvm_src_path/$rvm_ruby_string"
     rvm_ruby_binary="$rvm_ruby_home/bin/ruby"
     rvm_ruby_irbrc="$rvm_ruby_home/.irbrc"
-    rvm_selected=1
+    rvm_selected_flag=1
 
-    export rvm_ruby_interpreter rvm_ruby_version rvm_ruby_repo_url rvm_ruby_package_name rvm_url rvm_ruby_patch_level rvm_ruby_configure rvm_ruby_make rvm_ruby_make_install rvm_ruby_rev rvm_ruby_tag rvm_major_version rvm_minor_version rvm_gem_set_name rvm_gem_path rvm_gem_home rvm_path rvm_source_path rvm_bin_path rvm_ruby_binary rvm_ruby_home rvm_log_path rvm_ruby_log_path rvm_source_path rvm_ruby_src_path rvm_ruby_irbrc rvm_selected rvm_ruby_string
+    export rvm_ruby_interpreter rvm_ruby_version rvm_ruby_repo_url rvm_ruby_package_name rvm_url rvm_ruby_patch_level rvm_ruby_configure rvm_ruby_make rvm_ruby_make_install rvm_ruby_revision rvm_ruby_tag rvm_major_version rvm_minor_version rvm_gem_set_name rvm_gem_path rvm_ruby_gem_home rvm_path rvm_src_path rvm_bin_path rvm_ruby_binary rvm_ruby_home rvm_log_path rvm_ruby_log_path rvm_src_path rvm_ruby_src_path rvm_ruby_irbrc rvm_selected_flag rvm_ruby_string
   else
-    rvm_gem_home=$GEM_HOME
+    rvm_ruby_gem_home=$GEM_HOME
   fi
 }
 
 function __rvm_use {
-  if [ -z "$rvm_selected" ] ; then __rvm_select $* ; fi
+  if [ -z "$rvm_selected_flag" ] ; then __rvm_select $* ; fi
   if [ -z "$rvm_ruby_interpreter" ] ; then rvm_ruby_interpreter="default" ; fi
 
   if [ "$rvm_ruby_interpreter" = "default" ] ; then
@@ -202,8 +184,8 @@ function __rvm_use {
     fi
 
   else
-    GEM_HOME=$rvm_gem_home ; export GEM_HOME
-    GEM_PATH=$rvm_gem_home ; export GEM_PATH
+    GEM_HOME=$rvm_ruby_gem_home ; export GEM_HOME
+    GEM_PATH=$rvm_ruby_gem_home ; export GEM_PATH
     MY_RUBY_HOME=$rvm_ruby_home ; export MY_RUBY_HOME
     RUBY_VERSION=$rvm_ruby_package_name ; export RUBY_VERSION
     IRBRC="$rvm_ruby_irbrc" ; export IRBRC
@@ -255,34 +237,54 @@ function __rvm_use {
     unset rvm_default_flag
   fi
 
-  if [ ! -z "$rvm_load_flag" ] ; then __rvm_gemset_load ; fi
-  if [ ! -z "$rvm_dump_flag" ] ; then __rvm_gemset_dump ; fi
+  if [ ! -z "$rvm_load_flag" ] ; then __rvm_gems_load ; fi
+  if [ ! -z "$rvm_dump_flag" ] ; then __rvm_gems_dump ; fi
 }
 
 function __rvm_ruby_string {
   if [ "$rvm_ruby_interpreter" = "system" ] ; then
     rvm_ruby_string="system"
   elif [ ! -z "$rvm_ruby_string" ] ; then
-    rvm_ruby_string=`echo "$rvm_ruby_string" | sed 's/ruby-enterprise/ree/g'` # dash-antics :)
-    rvm_ruby_interpreter=`echo $rvm_ruby_string |  tr '-' ' ' | awk '{print $1}'`
-    rvm_ruby_version=`echo $rvm_ruby_string | awk -F'-' '{print $2}'`
-    revision=`echo $rvm_ruby_string | awk -F'-' '{print $3}'`
+    ruby_string=$(echo "$rvm_ruby_string" | sed 's/ruby-enterprise/ree/g') # dash-antics :
+    __rvm_unset_ruby_variables
+
+    rvm_ruby_interpreter=$(echo $ruby_string |  awk -F'-' '{print $1}')
+    rvm_ruby_version=$(echo $ruby_string |  awk -F'-' '{print $2}')
+    if [ ! -z "$(echo $rvm_ruby_interpreter | awk '/^1\.[8-9]/')" ] ; then
+      rvm_ruby_patch_level=$rvm_ruby_version
+      rvm_ruby_version=$rvm_ruby_interpreter
+      rvm_ruby_interpreter="ruby"
+      if [ -z "$rvm_ruby_patch_level" ] ; then
+        rvm_ruby_patch_level="${rvm_ruby_patch_level:-$(__rvm_db "${rvm_ruby_interpreter}_${rvm_ruby_version}_patch_level")}"
+      fi
+    elif [ ! -z "$(echo $rvm_ruby_interpreter | awk '/^1\.[3-4]/')" ] ; then
+      rvm_ruby_version=$rvm_ruby_interpreter
+      rvm_ruby_interpreter=jruby
+      unset rvm_ruby_patch_level
+    fi
+
+    if [ "$rvm_ruby_version" = "head" ] ; then
+      revision="head"
+      if [ "$rvm_ruby_interpreter" = "ree" ] ; then rvm_ruby_version="1.8.7" ; fi
+      if [ "$rvm_ruby_interpreter" = "rbx" ] ; then unset revision ; fi
+    else
+      revision=$(echo $ruby_string | awk -F'-' '{print $3}')
+    fi
 
     if [ "$revision" = "head" -o "$revision" = "preview" ] ; then
       rvm_ruby_revision="$revision"
     else
-      echo $revision | grep '^p[0-9]\+' > /dev/null
-      if [ $? -eq 0 ] ; then
-        rvm_ruby_patch_level=`echo $revision | awk -F'p' '{print $2}'`
+      if [ ! -z "$(echo $revision | awk '/^p[0-9]\+/')" ] ; then
+        rvm_ruby_patch_level=${rvm_ruby_patch_level:-$(echo $revision | awk -F'p' '{print $2}')}
       else
-        echo $revision | grep '^[0-9]\+' > /dev/null
-        if [ $? -eq 0 ] ; then
-          rvm_ruby_rev="$revision"
+        if [ ! -z "$(echo $revision | awk '/^[0-9]\+/')" ] ; then
+          rvm_ruby_revision="$revision"
         else
-          unset rvm_ruby_patch_level rvm_ruby_rev
+          unset rvm_ruby_revision
         fi
       fi
     fi
+    unset ruby_string
   fi
   return 0
 }

data/scripts/update

@@ -21,6 +21,7 @@ for dir_name in src scripts bin log archives config gems examples ; do
   mkdir -p $rvm_path/$dir_name
 done
 
+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 ; do
   mkdir -p $rvm_path/$dir_name
   /bin/cp -Rf $source_dir/$dir_name $rvm_path

data/scripts/utility

@@ -1,18 +1,19 @@
 #!/bin/bash
 
 function __rvm_info {
-cat <<Info
+  full_version=$(ruby -v)
+  cat <<Info
 
 system:
   uname: "$(uname -a)"
 
 ruby:
-  interpreter:  "`ruby -v | awk '{print $1}'`"
-  version:      "`ruby -v | awk '{print $2}'`"
-  date:         "`ruby -v | sed 's/^.*(\([0-9]\{4\}\(-[0-9][0-9]\)\{2\}\).*$/\1/'`"
-  platform:     "`ruby -v | sed 's/^.*\[//' | sed 's/\].*$//'`"
-  patchlevel:   "`ruby -v | sed 's/^.*(//' | sed 's/).*$//'`"
-  full_version: "`ruby -v`"
+  interpreter:  "`echo $full_version | awk '{print $1}'`"
+  version:      "`echo $full_version | awk '{print $2}'`"
+  date:         "`echo $full_version | sed 's/^.*(\([0-9]\{4\}\(-[0-9][0-9]\)\{2\}\).*$/\1/'`"
+  platform:     "`echo $full_version | sed 's/^.*\[//' | sed 's/\].*$//'`"
+  patchlevel:   "`echo $full_version | sed 's/^.*(//' | sed 's/).*$//'`"
+  full_version: "$full_version"
 
 homes:
   gem:          "${GEM_HOME:-'not set'}"
@@ -29,6 +30,7 @@ environment:
   MY_RUBY_HOME: "$MY_RUBY_HOME"
   IRBRC:        "$IRBRC"
 Info
+  unset full_version
 }
 
 function __rvm_debug {
@@ -55,28 +57,40 @@ function __rvm_debug {
 }
 
 # Logging functions based on level
+# TODO: Allow specification of a base file name to output to.
 function __rvm_log {
-  case "$1" in
+  if [ ! -z "$2" ] ; then level=$1 ; shift ; else level="info" ; fi
+  message=$1
+  case "$level" in
     debug) shift ;
       if [ ! -z "$rvm_debug_flag" ] ; then
-        echo -e "\033[0;35m<d>\033[0m $* \033[0;35m</d> \033[0m "
+        echo -e "\033[0;35m<d>\033[0m $message \033[0;35m</d> \033[0m "
       fi
     ;;
-    info)  shift ; echo -e "\033[0;32m<i>\033[0m $* \033[0;32m</i> \033[0m " ;;
-    warn)  shift ; echo -e "\033[0;33m<w>\033[0m $* \033[0;33m</w> \033[0m " ;;
-    error) shift ; echo -e "\033[0;31m<e>\033[0m $* \033[0;31m</e> \033[0m " ;;
-    fail)  shift ; echo -e "\033[0;31m<f>\033[0m $* \033[0;31m</f> \033[0m " ; __rvm_pushpop ; return 1 ;;
-    *) echo -e "$*"
+    info)  shift ; echo -e "\033[0;32m<i>\033[0m $message \033[0;32m</i> \033[0m " ;;
+    warn)  shift ; echo -e "\033[0;33m<w>\033[0m $message \033[0;33m</w> \033[0m " ;;
+    error) shift ; echo -e "\033[0;31m<e>\033[0m $message \033[0;31m</e> \033[0m " ;;
+    fail)  shift ; echo -e "\033[0;31m<f>\033[0m $message \033[0;31m</f> \033[0m " ; __rvm_pushpop ; return 1 ;;
+    *) echo -e "$message"
   esac
 }
 
+if [ ! -z "$ZSH_VERSION" ] ; then __shell_array_start=1 ; else __shell_array_start=0 ; fi
+__rvm_push() {
+  array=$1 ; shift ; item=$2
+  # TODO: allow loop over more arguments.
+  eval "index=\$((\${#${array}[*]} + $__shell_array_start))"
+  eval "${array}[${index}]=${item}"
+  unset array item
+}
+
 function __rvm_clean-path {
-  PATH=`echo $PATH | tr -s ':' '\n' | awk '!($0 in a){a[$0];print}' | tr -s '\n' ':' | sed 's/:$//'`
+  PATH=$(echo $PATH | tr -s ':' '\n' | awk '!($0 in a){a[$0];print}' | tr -s '\n' ':' | sed 's/:$//')
   export PATH
 }
 
 function __rvm_remove-rvm-from-path {
-  PATH=`echo $PATH | tr -s ':' '\n' | grep -v "\.rvm" | tr -s '\n' ':' | sed 's/:$//'`
+  PATH=$(echo $PATH | tr -s ':' '\n' | grep -v "\.rvm" | tr -s '\n' ':' | sed 's/:$//')
   export PATH
 }
 
@@ -84,15 +98,15 @@ function __rvm_gi { gem install -q --no-rdoc --no-ri $* ; }
 
 function __rvm_run {
   log_file_name="$1" ; command="$2" ; message="$3"
-  rvm_ruby_log_path=${rvm_ruby_log_path:-$rvm_path/log}
-  mkdir -p `dirname $rvm_ruby_log_path/$log_file_name.log`
+  rvm_ruby_log_path="${rvm_ruby_log_path:-$rvm_path/log}"
+  mkdir -p $(dirname "$rvm_ruby_log_path/$log_file_name.log")
 
   if [ ! -z "$message" ] ; then __rvm_log "info" "$message" ; fi
   __rvm_log "debug" "Executing: $command"
-  touch $rvm_ruby_log_path/$log_file_name.log $rvm_ruby_log_path/$log_file_name.error.log # for zsh :(
-  echo "[$(date +'%Y-%m-%d %H:%M:%S')] $command" | tee $rvm_ruby_log_path/$log_file_name.log > $rvm_ruby_log_path/$log_file_name.error.log
+  touch "$rvm_ruby_log_path/$log_file_name.log" "$rvm_ruby_log_path/$log_file_name.error.log" # for zsh :(
+  echo "[$(date +'%Y-%m-%d %H:%M:%S')] $command" | tee "$rvm_ruby_log_path/$log_file_name.log" > "$rvm_ruby_log_path/$log_file_name.error.log"
   if [ -z "$rvm_niceness" -o "$rvm_niceness" = "0" ] ; then
-    eval "$command" >> $rvm_ruby_log_path/$log_file_name.log 2>> $rvm_ruby_log_path/$log_file_name.error.log
+    eval "$command" >> "$rvm_ruby_log_path/$log_file_name.log" 2>> "$rvm_ruby_log_path/$log_file_name.error.log"
   else
     eval "nice -n $rvm_niceness \`$command\`" >> $rvm_ruby_log_path/$log_file_name.log 2>> $rvm_ruby_log_path/$log_file_name.error.log
   fi
@@ -101,11 +115,12 @@ function __rvm_run {
 }
 
 function __rvm_cleanup_variables {
-  unset rvm_selected rvm_action rvm_ruby_interpreter rvm_ruby_patch_level rvm_ruby_version rvm_irbrc_file rvm_ruby_irbrc rvm_source_path rvm_path rvm_prefix_path rvm_ruby_package_name rvm_gem_path rvm_command rvm_error_message rvm_ruby_home rvm_ruby_binary rvm_gem_set_name rvm_ruby_tag rvm_ruby_rev rvm_url rvm_ruby_make rvm_ruby_configure rvm_ruby_make_install rvm_config_path rvm_ruby_string rvm_bin_path rvm_force_flag rvm_all_flag rvm_reconfigure_flag rvm_make_flags rvm_bin_flag rvm_load_flag rvm_dump_flag rvm_self_flag rvm_gem_flag rvm_rubygems_flag rvm_debug_flag rvm_delete_flag rvm_summary_flag rvm_test_flag _rvm_spec_flag rvm_json_flag rvm_yaml_flag rvm_ruby_string rvm_ruby_selector rvm_shebang_flag rvm_env_flag rvm_head_flag rvm_tail_flag
+  __rvm_unset_ruby_variables
+  unset rvm_selected_flag rvm_action rvm_irbrc_file rvm_src_path rvm_path rvm_prefix_path rvm_gem_path rvm_command rvm_error_message rvm_gem_set_name rvm_url rvm_config_path rvm_bin_path rvm_force_flag rvm_all_flag rvm_reconfigure_flag rvm_make_flags rvm_bin_flag rvm_load_flag rvm_dump_flag rvm_self_flag rvm_gem_flag rvm_rubygems_flag rvm_debug_flag rvm_delete_flag rvm_summary_flag rvm_test_flag _rvm_spec_flag rvm_json_flag rvm_yaml_flag rvm_shebang_flag rvm_env_flag rvm_head_flag rvm_tail_flag rvm_use_flag rvm_dir_flag rvm_list_flag rvm_empty_flag rvm_log_path rvm_file_name
 }
 
 function __rvm_unset_ruby_variables {
-  unset rvm_ruby_interpreter rvm_ruby_version rvm_ruby_repo_url rvm_ruby_package_name rvm_ruby_patch_level rvm_ruby_configure rvm_ruby_make rvm_ruby_make_install rvm_ruby_rev rvm_ruby_tag rvm_major_version rvm_minor_version rvm_gem_set_name rvm_gem_home rvm_ruby_binary rvm_ruby_package_name rvm_ruby_home rvm_ruby_log_path rvm_ruby_src_path rvm_ruby_irbrc rvm_selected rvm_ruby_selector rvm_ruby_string
+  unset rvm_ruby_interpreter rvm_ruby_version rvm_ruby_repo_url rvm_ruby_package_name rvm_ruby_patch_level rvm_ruby_configure rvm_ruby_make rvm_ruby_make_install rvm_ruby_revision rvm_ruby_tag rvm_major_version rvm_minor_version rvm_ruby_gem_home rvm_ruby_binary rvm_ruby_home rvm_ruby_log_path rvm_ruby_src_path rvm_ruby_irbrc rvm_selected_flag rvm_ruby_selector rvm_ruby_string rvm_ruby_src_path rvm_ruby_repo_url rvm_major_version rvm_minor_version rvm_ruby_gem_home
 }
 
 # TODO: root user loadng of /etc/rvmrc
@@ -114,9 +129,9 @@ function __rvm_load-rvmrc {
 }
 
 function __rvm_bin_scripts {
-  for rvm_ruby_binary in `/bin/ls $rvm_path/*/bin/ruby 2> /dev/null` ; do
+  for rvm_ruby_binary in $(/bin/ls $rvm_path/*/bin/ruby 2> /dev/null) ; do
     if [ -x $rvm_ruby_binary ] ; then
-      rvm_ruby_string=`dirname $rvm_ruby_binary | xargs dirname | xargs basename`
+      rvm_ruby_string=$(dirname $rvm_ruby_binary | xargs dirname | xargs basename)
       __rvm_select
       __rvm_bin_script
     fi
@@ -124,14 +139,14 @@ function __rvm_bin_scripts {
 }
 
 function __rvm_bin_script {
-  if [ -z "$rvm_selected" ] ; then __rvm_select $* ; fi
+  if [ -z "$rvm_selected_flag" ] ; then __rvm_select $* ; fi
 ruby_wrapper=$(cat <<RubyWrapper
 #!/bin/bash
 
-GEM_HOME=$rvm_gem_home ; export GEM_HOME
-GEM_PATH=$rvm_gem_home ; export GEM_PATH
+GEM_HOME=$rvm_ruby_gem_home ; export GEM_HOME
+GEM_PATH=$rvm_ruby_gem_home ; export GEM_PATH
 MY_RUBY_HOME=$rvm_ruby_home ; export MY_RUBY_HOME
-PATH=$rvm_ruby_home/bin:$rvm_gem_home/bin:\$PATH ; export PATH
+PATH=$rvm_ruby_home/bin:$rvm_ruby_gem_home/bin:\$PATH ; export PATH
 
 exec "$rvm_ruby_binary" "\$@"
 RubyWrapper
@@ -144,12 +159,12 @@ RubyWrapper
 
 function __rvm_fetch {
   __rvm_pushpop $rvm_archives_path
-  archive=`basename "$1"`
+  archive=$(basename "$1")
   __rvm_log "debug" "Fetching $archive"
   # Check first if we have the correct archive
-  if [ -e $archive ] && [ -e $archive.md5 ] ; then
+  if [ -e "$archive" ] && [ -e "$archive.md5" ] ; then
     __rvm_log "debug" "Found archive and its md5, testing correctness"
-    if [ `md5sum --status -c $archive.md5` -gt 0 ] ; then
+    if [ $(md5sum --status -c "$archive.md5") -gt 0 ] ; then
       __rvm_log "debug" "Archive is bad, downloading"
       download=1
     else
@@ -166,19 +181,29 @@ function __rvm_fetch {
     eval $rvm_fetch "$1"
     result=$?
     if [ $result -gt 0 ] ; then
+      unset retry
       if [ $result -eq 78 ] ; then
         __rvm_log "error" "The requested url does not exist: '$1'"
+      elif [ $result -eq 18 ] ; then
+        __rvm_log "error" "Partial file. Only a part of the file was transferred. Removing partial and re-trying."
+        rm -f "$archive"
+        retry=1
       elif [ $result -eq 33 ] ; then
         __rvm_log "debug" "Server does not support 'range' command, removing '$archive'"
-        rm -f $archive
+        rm -f "$archive"
+        retry=1
+      else
+        __rvm_log "error" "There was an error, please check $rvm_ruby_log_path/*.error.log"
+      fi
+
+      if [ $retry -eq 1 ] ; then
         eval $rvm_fetch "$1"
         result=$?
         if [ $result -gt 0 ] ; then
           __rvm_log "error" "There was an error, please check $rvm_ruby_log_path/*.error.log"
         fi
-      else
-        __rvm_log "error" "There was an error, please check $rvm_ruby_log_path/*.error.log"
       fi
+
     fi
     __rvm_pushpop
   fi
@@ -202,27 +227,21 @@ function __rvm_load_defaults {
     done
   fi
 
-  rvm_system_ps1=`__rvm_db "system_ps1"`
-  if [ -z "$rvm_system_ps1" ] ; then
-    rvm_system_ps1=$PS1
-    __rvm_db "system_ps1" "$rvm_system_ps1"
-  fi
-
-  rvm_system_ruby=`__rvm_db "system_ruby"`
+  rvm_system_ruby=$(__rvm_db "system_ruby")
   if [ ! -z "$rvm_system_ruby" ] ; then
-    rvm_system_ruby=`which ruby`
+    rvm_system_ruby=$(which ruby)
     if [ $? -ne 0 ] ; then
       __rvm_log "info" "System ruby not found, no db will be stored."
     else
       __rvm_db "system_ruby" "$rvm_system_ruby"
 
       # Now store system system & user gem paths
-      rvm_system_user_gem_path=`__rvm_db "system_user_gem_path"`
+      rvm_system_user_gem_path=$(__rvm_db "system_user_gem_path")
       if [ -z "$rvm_system_user_gem_path" ] ; then
         rvm_system_user_gem_path=$( rvm system ; gem env gemdir user; )
         __rvm_db "system_user_gem_path" "$rvm_system_user_gem_path"
       fi
-      rvm_system_gem_path=`__rvm_db "system_gem_path"`
+      rvm_system_gem_path=$(__rvm_db "system_gem_path")
       if [ -z "$rvm_system_gem_path" ] ; then
         rvm_system_gem_path=$( rvm system ; gem env gemdir; )
         __rvm_db "system_gem_path" "$rvm_system_gem_path"
@@ -243,7 +262,7 @@ function __rvm_reset {
   rvm_ruby_interpreter="system"
   __rvm_select
 
-  for system_config in system_ps1 system_ruby system_gem_path system_user_gem_path ; do
+  for system_config in system_ruby system_gem_path system_user_gem_path ; do
     __rvm_db "$system_config" "delete"
   done ; unset system_config variable
 
@@ -275,13 +294,13 @@ function __rvm_implode {
 }
 
 function __rvm_gemdir {
-  if [ -z "$rvm_selected" ] ; then __rvm_select $* ; fi
-  mkdir -p $rvm_gem_home
-  echo $rvm_gem_home
+  if [ -z "$rvm_selected_flag" ] ; then __rvm_select $* ; fi
+  mkdir -p $rvm_ruby_gem_home
+  echo $rvm_ruby_gem_home
 }
 
 function __rvm_source_dir {
-  if [ -z "$rvm_selected" ] ; then __rvm_select $* ; fi
+  if [ -z "$rvm_selected_flag" ] ; then __rvm_select $* ; fi
   if [ -z "$rvm_ruby_src_path" ] ; then
     __rvm_log "fail" "No source directory exists for the default implementation."
   else
@@ -292,7 +311,7 @@ function __rvm_source_dir {
 # clones from source implementation/version to default
 # TODO: Merge this into 'rvm sync'
 function __rvm_gemdup {
-  if [ -z "$rvm_selected" ] ; then __rvm_select $* ; fi
+  if [ -z "$rvm_selected_flag" ] ; then __rvm_select $* ; fi
   __rvm_log "debug" "$rvm_ruby_interpreter"
   if [ "$rvm_ruby_interpreter" = "default" ] ; then
     # TODO: ~/.rvm/default first, then system user
@@ -303,20 +322,20 @@ function __rvm_gemdup {
     rvm_source_gem_path="$rvm_system_gem_path"
   else
     # TODO: use selector for this?
-    rvm_source_gem_path=${rvm_gem_home/$rvm_ruby_interpreter/$rvm_ruby_version}
+    rvm_source_gem_path=${rvm_ruby_gem_home/$rvm_ruby_interpreter/$rvm_ruby_version}
   fi
   __rvm_gem_sync
 }
 
 function __rvm_gem_sync {
   if [ ! -z "$rvm_source_gem_path" ] ; then
-    for rvm_gem_name_version in `/bin/ls $rvm_source_gem_path/gems 2> /dev/null` ; do
-      rvm_gem_name=${rvm_gem_name_version%-*}
-      rvm_gem_version=${rvm_gem_name_version##*-}
+    for rvm_gem_name_version in $rvm_source_gem_path/gems/* ; do
+      rvm_gem_name="${rvm_gem_name_version%-*}"
+      rvm_gem_version="${rvm_gem_name_version##*-}"
       if [ -d $GEM_HOME/gems/$rvm_gem_name_version ] ; then
         echo "$rvm_gem_name_version already installed."
       else
-        __rvm_gi $rvm_source_gem_path/cache/$rvm_gem_name-$rvm_gem_version.gem
+        __rvm_gi "$rvm_source_gem_path/cache/$rvm_gem_name-$rvm_gem_version.gem"
       fi
     done
     unset rvm_gem_name_version rvm_gem_name rvm_gem_version
@@ -358,10 +377,10 @@ function __rvm_list {
     echo -e "rbx head (rubinius head, the default)\nrbx head --jit"
     echo -e "ree 1.8.6 --head\nree (1.8.7, the default)"
   else
-    current_ruby=`which ruby | xargs dirname | xargs dirname | xargs basename 2> /dev/null`
+    current_ruby=$(which ruby | xargs dirname | xargs dirname | xargs basename 2> /dev/null)
     echo -e "\nruby:\n"
-    for version in `/bin/ls -l $rvm_path/ 2> /dev/null | awk '/ ruby-[1-2].*/ { print $NF  }'` ; do
-      string=`$rvm_path/$version/bin/ruby -v`
+    for version in $(/bin/ls -l $rvm_path/ 2> /dev/null | awk '/ ruby-[1-2].*/ { print $NF  }') ; do
+      string=$($rvm_path/$version/bin/ruby -v)
       if [ "$current_ruby" = "$version" ] ; then
         echo -e "=> $version : $string"
         selected="1"
@@ -371,8 +390,8 @@ function __rvm_list {
     done ; unset version
 
     echo -e "\njruby:\n"
-    for version in `/bin/ls -l $rvm_path/ 2> /dev/null | awk '/jruby-.*/ { print $NF }'` ; do
-      string=`$rvm_path/$version/bin/ruby -v`
+    for version in $(/bin/ls -l $rvm_path/ 2> /dev/null | awk '/jruby-.*/ { print $NF }') ; do
+      string=$($rvm_path/$version/bin/ruby -v)
       if [ "$current_ruby" = "$version" ] ; then
         echo -e "=> $version : $string"
         selected="1"
@@ -382,8 +401,8 @@ function __rvm_list {
     done ; unset version
 
     echo -e "\nree:\n"
-    for version in `/bin/ls $rvm_path/ 2> /dev/null | awk '/ruby-enterprise-.*/ { print $NF }'` ; do
-      string=`$rvm_path/$version/bin/ruby -v | tr "\n" ' ' `
+    for version in $(/bin/ls $rvm_path/ 2> /dev/null | awk '/ree-.*/ { print $NF }') ; do
+      string="$($rvm_path/$version/bin/ruby -v | tr "\n" ' ' )"
       if [ "$current_ruby" = "$version" ] ; then
         echo -e "=> $version : $string"
         selected="1"
@@ -393,10 +412,10 @@ function __rvm_list {
     done ; unset version
 
     if [ -f $rvm_path/default -a -s $rvm_path/default ] ; then
-      version=`grep '^MY_RUBY_HOME' ~/.rvm/default | awk -F"'" '{print $2}' | xargs basename`
+      version=$(grep '^MY_RUBY_HOME' ~/.rvm/default | awk -F"'" '{print $2}' | xargs basename)
       if [ ! -z "$version" ] ; then
         echo -e "\ndefault:\n"
-        string=`$rvm_path/$version/bin/ruby -v`
+        string=$($rvm_path/$version/bin/ruby -v)
         if [ "$current_ruby" = "$version" ] ; then
           echo -e "=> $version : $string"
           selected="1"
@@ -407,9 +426,9 @@ function __rvm_list {
     fi
 
     echo -e "\nsystem:\n"
-    system_version=`rvm system ; ruby -v 2> /dev/null`
+    system_version=$(rvm system ; ruby -v 2> /dev/null)
     if [ ! -z "$system_version" ] ; then
-      if [ "$(`which ruby` -v)" = "$system_version" ] ; then
+      if [ "$($(which ruby) -v)" = "$system_version" ] ; then
         echo -e "=> $system_version\n"
       else
         echo -e "   $system_version\n"
@@ -419,24 +438,19 @@ function __rvm_list {
 }
 
 function __rvm_initialize {
-  rvm_fetch=`which curl`
+  rvm_fetch=$(which curl)
   if [ $? -ne 0 ] ; then
-    rvm_fetch=`which wget`
-    if [ $? -ne 0 ] ; then
-      __rvm_log "fail" "rvm expects either curl or wget, neither seem to be in your path :("
-    else
-      rvm_fetch="wget -c " # -q for quiet
-    fi
+    __rvm_log "fail" "rvm requires curl, which does not seem to exist in your path :("
   else
     rvm_fetch="$rvm_fetch -O -L --create-dirs -C - " # -s for silent
   fi
 
   # TODO: Sanitize user input, ensure that there is a / a the end...
-  if [ "`whoami`" = "root" ] ; then
+  if [ "$(whoami)" = "root" ] ; then
     __rvm_log "fail" "root user support is not yet implemented."
-    #rvm_prefix_path=${rvm_prefix_path:-/usr/local/}
+    rvm_prefix_path="${rvm_prefix_path:-/usr/local/}"
   else
-    rvm_prefix_path=${rvm_prefix_path:-"$HOME/."}
+    rvm_prefix_path="${rvm_prefix_path:-"$HOME/."}"
   fi
   if [ "${rvm_prefix_path#${rvm_prefix_path%?}}" = '.' -o "${rvm_prefix_path#${rvm_prefix_path%?}}" = '/' ] ; then
     rvm_path="${rvm_prefix_path}rvm"
@@ -444,12 +458,12 @@ function __rvm_initialize {
     rvm_path="${rvm_prefix_path}/rvm"
   fi
   rvm_archives_path="${rvm_archives_path:-"$rvm_path/archives"}"
-  rvm_source_path="${rvm_source_path:-"$rvm_path/src"}"
-  rvm_log_path=${rvm_log_path:-"$rvm_path/log"}
-  rvm_bin_path=${rvm_bin_path:-"$rvm_path/bin"}
-  rvm_gem_path=${rvm_gem_path:-"$rvm_path/gems"}
-  rvm_config_path=${rvm_config_path:-"$rvm_path/config"}
-  rvm_temp_path=${rvm_temp_path:-"$rvm_path/tmp"}
+  rvm_src_path="${rvm_src_path:-"$rvm_path/src"}"
+  rvm_log_path="${rvm_log_path:-"$rvm_path/log"}"
+  rvm_bin_path="${rvm_bin_path:-"$rvm_path/bin"}"
+  rvm_gem_path="${rvm_gem_path:-"$rvm_path/gems"}"
+  rvm_config_path="${rvm_config_path:-"$rvm_path/config"}"
+  rvm_temp_path="${rvm_temp_path:-"$rvm_path/tmp"}"
 
   rvm_ruby_repo_url="${rvm_ruby_repo_url:-"http://svn.ruby-lang.org/repos/ruby"}"
   # Rubinius sha1's will be available after RC1.
@@ -458,17 +472,19 @@ function __rvm_initialize {
   rvm_ruby_load_path="."
   rvm_ruby_require=""
 
+  if [ "$(uname)" = "Darwin" ] ; then rvm_archflags="${rvm_archflags:-'-arch i386 -arch x86_64'}" ; fi
+
   __rvm_clean-path
   rvm_result=$(echo $PATH | grep 'rvm\/bin:')
   if [ -z $rvm_result ] ; then
     PATH=$rvm_bin_path:$PATH ; export PATH
   fi
 
-  mkdir -p $rvm_source_path $rvm_bin_path $rvm_archives_path $rvm_gem_path $rvm_temp_path
+  mkdir -p $rvm_src_path $rvm_bin_path $rvm_archives_path $rvm_gem_path $rvm_temp_path
 }
 
 function __rvm_update {
-  if [ "$rvm_ruby_rev" = "head" -o ! -z "$rvm_self_flag" -o ! -z "$rvm_update_flag" ] ; then
+  if [ "$rvm_ruby_revision" = "head" -o ! -z "$rvm_self_flag" -o ! -z "$rvm_update_flag" ] ; then
     __rvm_version
     __rvm_update_rvm
     __rvm_version
@@ -480,12 +496,12 @@ function __rvm_update {
 }
 
 function __rvm_update_rvm {
-  mkdir -p $rvm_source_path
-  if [ "$rvm_ruby_rev" = "head" ] ; then
-    if [ -d $rvm_source_path/rvm/.git ] ; then
-      cd $rvm_source_path/rvm/ && git pull origin master && ./scripts/install
+  mkdir -p $rvm_src_path
+  if [ "$rvm_ruby_revision" = "head" ] ; then
+    if [ -d $rvm_src_path/rvm/.git ] ; then
+      cd $rvm_src_path/rvm/ && git pull origin master && ./scripts/install
     else
-      cd $rvm_source_path && git clone git://github.com/wayneeseguin/rvm.git && cd rvm/ && ./install
+      cd $rvm_src_path && git clone git://github.com/wayneeseguin/rvm.git && cd rvm/ && ./install
     fi
   else
     # TODO: rvm_install_path:
@@ -521,8 +537,7 @@ function __rvm_reboot {
     source ~/.rvm/scripts/rvm
   else
     __rvm_log "info" "Carry on then..."
-  fi
-  unset response
+  fi ; unset response
 }
 
 function __rvm_reload {
@@ -563,7 +578,7 @@ function __rvm_ruby_do {
   else
     __rvm_log "warn" "'$rvm_ruby_home/bin/$binary' either does not exist or is not executable? :("
   fi
-  unset rvm_ruby_interpreter rvm_ruby_version rvm_ruby_repo_url rvm_ruby_package_name rvm_ruby_patch_level rvm_ruby_configure rvm_ruby_make rvm_ruby_make_install rvm_ruby_rev rvm_ruby_tag rvm_major_version rvm_minor_version rvm_gem_set_name rvm_gem_home rvm_ruby_binary rvm_ruby_package_name rvm_ruby_home rvm_ruby_log_path rvm_ruby_src_path rvm_ruby_irbrc rvm_selected
+  __rvm_unset_ruby_variables
 }
 
 function __rvm_do {
@@ -619,13 +634,9 @@ function __rvm_summary {
 function __rvm_yaml {
   export successes errors statuses
   yaml="totals:\n  rubies: ${#rubies[*]}\n  successes: ${#successes[*]}\n  errors: ${#errors[*]}\nsuccesses:"
-  for var in ${successes[*]} ; do
-    yaml="$yaml\n  - $var"
-  done
+  for var in ${successes[*]} ; do yaml="$yaml\n  - $var" ; done
   yaml="$yaml\nerrors:"
-  for var in ${errors[*]} ; do
-    yaml="$yaml\n  - $var"
-  done
+  for var in ${errors[*]} ; do yaml="$yaml\n  - $var" ; done
   yaml="$yaml\nrubies:"
   total=${#rubies[*]}
   if [ ! -z "$ZSH_VERSION" ] ; then array_start=1 ; else array_start=0 ; fi
@@ -662,120 +673,17 @@ function __rvm_json {
 }
 
 function __rvm_benchmark {
-  rvm_code="$(cat <<RubyCode
-require "benchmark" \n
-Benchmark.bmbm do |benchmark| \n
-  benchmark.report("$rvm_ruby_file") do \n
-RubyCode
-)"
-  echo -e "$rvm_code" > $rvm_temp_path/$$.rb
-  cat $rvm_ruby_file >> $rvm_temp_path/$$.rb
-  echo -e "\n end \nend\n" >> $rvm_temp_path/$$.rb
-  unset rvm_code
+  code="require \"benchmark\" \n Benchmark.bmbm do |benchmark| \n benchmark.report(\"${rvm_ruby_file}\") do \n"
+  echo -e "$code" > "$rvm_temp_path/$$.rb"
+  unset code
+  cat $rvm_ruby_file >> "$rvm_temp_path/$$.rb"
+  echo -e "\n end \nend\n" >> "$rvm_temp_path/$$.rb"
   rvm_ruby_args="$rvm_temp_path/$$.rb"
   rvm_action="ruby"
   if [ ! -z "$rvm_debug_flag" ] ; then echo -e "$rvm_temp_path/$$.rb:\n$(cat $rvm_temp_path/$$.rb)" ; fi
   __rvm_do
 }
 
-__rvm_gemset_delete () {
-  if [ -z "$rvm_selected" ] ; then __rvm_select $* ; fi
-
-  if [ ! -z $rvm_gem_set_name ] ; then
-    gemdir="$rvm_gem_path/$rvm_ruby_interpreter/$rvm_ruby_version-$rvm_gem_set_name"
-    if [ -d $gemdir ] ; then
-      __rvm_log "warn" "Are you SURE you wish to remove the installed gemset '$rvm_gem_set_name ' ($gemdir)?"
-      echo -n "(anything other than 'yes' will cancel) > "
-      read response
-      if [ "$response" = "yes" ] ; then
-        rm -rf  $gemdir
-      else
-        __rvm_log "info" "Not doing anything, phew... close call that one eh?"
-      fi
-    else
-      __rvm_log "info" "$gemdir does not exist, dirtywork alredy done."
-    fi
-    unset gemdir
-  else
-    __rvm_log "error" "A gemset name must be specified in order to delete a gemset."
-  fi
-}
-
-function __rvm_gemset_dump {
-  rvm_gem_set_name=${rvm_gem_set_name:-"default"}
-  rvm_file_name=${rvm_file_name:-$rvm_gem_set_name}
-
-  echo "# $rvm_gem_set_name.gemset generated gem dump file. Note that any env variable settings will be missing. Append these after using a ';' field separator" > $rvm_gem_set_name.gemset
-
-  for gem in $(gem list | sed 's/[\(|\)]//g' | sed 's/, /,/g' | tr ' ' ';') ; do
-    name=`echo $gem | awk -F';' '{print $1}'`
-    if [ -z "$rvm_latest_flag" ] ; then
-      versions=`echo $gem | awk -F';' '{print $2}' | sed 's/,/ /g'`
-      for version in $versions ; do
-        echo "$name -v$version" >> $rvm_file_name
-      done ; unset version versions
-    else
-      echo "$name" >> $rvm_file_name
-    fi ; unset name
-  done ; unset file_name
-}
-
-function __rvm_gemset_load {
-  rvm_gem_set_name=${rvm_gem_set_name:-"default"}
-  rvm_file_name=${rvm_file_name:-$rvm_gem_set_name}
-
-  echo "Loading $rvm_file_name file..."
-  rvm_ruby_gem_list=`/bin/ls $rvm_gem_home/specifications/ 2> /dev/null | sed 's/\.gemspec$//' 2> /dev/null`
-  while read line
-  do # Keep this on 2nd line :( bash fail.
-    # TODO: Switch to a different field separator than ; to allow for evals
-    gem=`echo $line | awk -F';' '{print $1}'`
-    gem_prefix=`echo $line | awk -F';' '{print $2}'`
-    gem_name=`echo $gem | awk '{print $1}'`
-    gem_version=`echo $gem | sed 's/^.*-v[=]*[ ]*//' | awk '{print $1}'`
-    gem_postfix=`echo $gem | sed "s/$gem_name//" | sed "s/-v[=]*[ ]*$gem_version//"`
-
-    if [ -z "$gem_version" ] ; then # no version
-      gem_file_name="${gem_name}*.gem"
-    else # version
-      gem_file_name="$gem_name-$gem_version.gem"
-    fi
-
-    cache_file=`/bin/ls -t $rvm_gem_path/*/*/cache/${gem_file_name}* 2> /dev/null | head -n1`
-    if [ -z "$cache_file" ] ; then
-      if [ -z "$gem_version" ] ; then
-        gem="$gem_name"
-      else
-        gem="$gem_name -v $gem_version"
-      fi
-    else # cached
-      gem_file_name=`basename $cache_file`
-      gem_string=`echo "$gem_file_name" | sed 's/\.gem$//'`
-      if [ ! -z "`echo "$rvm_ruby_gem_list" | awk "/$gem_string/{print}"`" ] ; then
-        if [ ! -z "$rvm_force_flag" ] ; then
-          cp $cache_file $rvm_temp_path/$gem_file_name
-          gem="$rvm_temp_path/$gem_file_name" # install as a named local gem
-        else
-          unset gem
-          __rvm_log "info" "$gem_name $gem_version is already installed, skipping. (use --force to force these to install regardless)"
-        fi
-      else
-        gem="$cache_file"
-      fi
-    fi
-
-    if [ ! -z "$gem" ] ; then
-      # TODO: Set vars if fourth field is non-empty (means that there are conditional statements to execute in the gem install line.
-      if [ -z "$vars" ] ; then
-        GEM_HOME="$rvm_gem_home" GEM_PATH="$rvm_gem_home" $gem_prefix $rvm_ruby_home/bin/gem install --no-rdoc --no-ri -q $gem $gem_postfix
-      else
-        eval "GEM_HOME='$rvm_gem_home' GEM_PATH='$rvm_gem_home' $gem_prefix $rvm_ruby_home/bin/gem install --no-rdoc --no-ri -q $gem $gem_postfix"
-      fi
-    fi
-    unset gem gem_prefix gem_name gem_version gem_file_name gem_postfix cache_file gem_file_name gem_string
-  done < <(awk '/^[a-zA-Z]/{print}' "$rvm_file_name")
-}
-
 function __rvm_irbrc {
   if [ -d $rvm_ruby_home -a ! -s $rvm_ruby_irbrc ] ; then
     rvm_ruby_irbrc_file=$(cat <<-Config
@@ -829,7 +737,7 @@ function __rvm_state {
 
 function __rvm_inspect {
   for binary in $rvm_ruby_args ; do
-    actual_file=`which $binary`
+    actual_file=$(which $binary)
     __rvm_log "info" "$actual_file:"
     if [ ! -z "$rvm_shebang_flag" ] ; then cat $actual_file | head -n 1    ; fi
     if [ ! -z "$rvm_env_flag" ]     ; then cat $actual_file | awk '/ENV/'  ; fi
@@ -844,15 +752,15 @@ function __rvm_inspect {
 # ruby supporting libraries:
 #
 function __rvm_readline_install {
-  __rvm_pushpop $rvm_source_path
+  __rvm_pushpop $rvm_src_path
   package="readline" ; version="5.2" ; archive_format="tar.gz"
   # TODO: Figure out how to list, grab and apply the patches
   __rvm_log "info" "Retrieving $package-$version.$archive_format"
-  __rvm_fetch ftp://ftp.gnu.org/gnu/readline/$package-$version.$archive_format"
-  __rvm_run "$package/extract" "tar zxf $rvm_archives_path/$package-$version.$archive_format -C $rvm_source_path" "Extracting $package-$version.$archive_format"
-  cd $rvm_source_path/$package-$version
-  if [ "`uname`" = "Darwin" ] ; then
-    sdk=`ls -t /Developer/SDKs/ | head -n 1`
+  __rvm_fetch "ftp://ftp.gnu.org/gnu/readline/$package-$version.$archive_format"
+  __rvm_run "$package/extract" "tar zxf $rvm_archives_path/$package-$version.$archive_format -C $rvm_src_path" "Extracting $package-$version.$archive_format"
+  cd "$rvm_src_path/$package-$version"
+  if [ "$(uname)" = "Darwin" ] ; then
+    sdk=$(ls -t /Developer/SDKs/ | head -n 1)
     CFLAGS="-isysroot /Developer/SDKs/$sdk -arch i386 -arch x86_64"
     LDFLAGS="-Wl,-syslibroot,/Developer/SDKs/$sdk -arch i386 -arch x86_64"
     export CFLAGS LDFLAGS
@@ -866,15 +774,32 @@ function __rvm_readline_install {
 }
 
 function __rvm_iconv_install {
-  __rvm_pushpop $rvm_source_path
+  __rvm_pushpop $rvm_src_path
   package="libiconv" ; version=1.13.1 ; archive_format="tar.gz"
   __rvm_log "info" "Retrieving $package-$version.$archive_format"
-  __rvm_fetch http://ftp.gnu.org/pub/gnu/libiconv/$package-$version.$archive_format"
-  __rvm_run "$package/extract" "tar zxf $rvm_archives_path/$package-$version.$archive_format -C $rvm_source_path" "Extracting $package-$version.$archive_format"
-  cd $rvm_source_path/$package-$version
+  __rvm_fetch "http://ftp.gnu.org/pub/gnu/libiconv/$package-$version.$archive_format"
+  __rvm_run "$package/extract" "tar zxf $rvm_archives_path/$package-$version.$archive_format -C $rvm_src_path" "Extracting $package-$version.$archive_format"
+  cd "$rvm_src_path/$package-$version"
   __rvm_run "$package/configure" "./configure --prefix=$rvm_path/usr --disable-static --enable-shared" "Configuring $package."
   __rvm_run "$package/make" "/usr/bin/make $rvm_make_flags" "Compiling $package"
   __rvm_run "$package/make.install" "/usr/bin/make install" "Installing $package to $rvm_path/usr"
   __rvm_pushpop
 }
 
+__rvm_monitor() {
+if [ -d test/ ] ; then
+  :
+elif [ -d spec/ ] ; then
+  :
+fi
+#
+#  timestamp() {
+#    if [ "$(uname)" = "Darwin" ] ; then
+#      $(stat -c "%Y" $1)
+#    else
+#      echo $(stat -f "%m" $1)
+#    fi
+#  }
+#
+}
+