rvm 0.0.80 → 0.0.81

data/scripts/update

@@ -1,15 +1,19 @@
 #!/usr/bin/env bash
 
-rc_files="$HOME/.bash_profile $HOME/.bashrc $HOME/.zshrc"
-if [[ -f "/etc/rvmrc" ]] ; then source "/etc/rvmrc" ; fi
-if [[ "root" = "$(whoami)" ]] ; then
-  rvm_path="${rvm_path:-/usr/local/rvm}"
-  rc_files="$rc_files /etc/profile /etc/zshenv"
-else
-  if [[ -f "$HOME/.rvmrc" ]] ; then source "$HOME/.rvmrc" ; fi
-  rvm_path="${rvm_path:-$HOME/.rvm}"
+if [[ -f /etc/rvmrc ]] ; then source /etc/rvmrc ; fi
+if [[ -f "$HOME/.rvmrc" ]] ; then source "$HOME/.rvmrc" ; fi
+if [[ -z "$rvm_path" ]] ; then unset rvm_path ; fi
+
+if [[ -z "$rvm_path" ]] ; then
+  if [[ "root" = "$(whoami)" ]] ; then
+    rvm_path="${rvm_path:-/usr/local/rvm}"
+  else
+    rvm_path="${rvm_path:-$HOME/.rvm}"
+  fi
 fi
 
+source scripts/initialize
+
 #
 # Setup
 #
@@ -21,8 +25,8 @@ 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)\n\n    shell scripts that allows a user to manage multiple ruby versions in their own account."
-echo -e "\n    Installing rvm to $rvm_path ..."
+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    Installing to $rvm_path..."
 for dir_name in src scripts bin log archives config gems examples ; do
   mkdir -p "$rvm_path/$dir_name"
 done
@@ -47,15 +51,15 @@ ln -nfs $rvm_path/scripts/rvm $rvm_path/bin/rvm
 #
 # RC Files
 #
-if [[ -z "$rvm_loaded_flag" ]] ; then
-  for rcfile in $(echo $rc_files) ; do
-    if [[ ! -f $rcfile ]] ; then touch $rcfile ; fi
-    if [[ -z "$(awk '/\.rvm\/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 line:\nif [[ -s $rvm_path/scripts/rvm ]] ; then source $rvm_path/scripts/rvm ; fi\n" >> $rcfile
-    fi
-  done
-fi
+for rcfile in $(echo $rvm_rc_files) ; do
+  if [[ ! -f $rcfile ]] ; then touch $rcfile ; fi
+  if [[ -z "$(awk "/$(echo "$rvm_path/scripts/rvm" | sed 's#/#\\/#g')/" $rcfile)" ]] ; then
+    echo "    Adding 'if [[ -s $rvm_path/scripts/rvm ]] && [[ "\$rvm_loaded_flag" -le 0 ]] ; then source $rvm_path/scripts/rvm ; fi' to $rcfile."
+    echo -e "\n# rvm-install added line:\nif [[ -s $rvm_path/scripts/rvm ]] && [[ "\$rvm_loaded_flag" != "1" ]] ; then source $rvm_path/scripts/rvm ; fi\n" >> $rcfile
+  else
+    : # it exists... remove it and append at the end
+  fi
+done
 
 if [[ "root" = "$(whoami)" ]] ; then
   ln -nfs $rvm_path/scripts/rvm /usr/local/bin/rvm
@@ -66,7 +70,7 @@ fi
 # System Checks
 #
 system="$(uname)"
-echo -e "\n    $(tput setaf 3)NOTES: $(tput sgr0)\n"
+echo -e "\n$(tput setaf 2)Notes: $(tput sgr0)\n"
 if [[ "Linux" = "$system" ]] ; then
   rvm_apt_get_binary="$(which aptitude 2> /dev/null)"
   rvm_emerge_binary="$(which emerge 2> /dev/null)"
@@ -74,44 +78,42 @@ if [[ "Linux" = "$system" ]] ; 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 "        $ aptitude 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 "        $ aptitude install libreadline5-dev libssl-dev bison"
-    echo -e "      $item For 1.9.X (if you wish to use it) we additionally recommend:"
-    echo -e "        $ aptitude install libxml2-dev"
+    echo -e "    $item For JRuby (if you wish to use it) you will need:"
+    echo -e "      $ aptitude 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 "      $ aptitude install libreadline5-dev libssl-dev bison"
+    echo -e "    $item For 1.9.X (if you wish to use it) we additionally recommend:"
+    echo -e "      $ aptitude install libxml2-dev"
 
   elif [[ ! -z "$rvm_emerge_binary" ]] ; then
-    echo -e "      $item For jRuby (if you wish to use it) you will need:"
-    echo -e "        $ 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 "      $ 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 "        $ pacman -Sy jdk jre"
+    echo -e "    $item For JRuby (if you wish to use it) you will need:"
+    echo -e "      $ 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 [[ "Darwin" = "$system"  ]] ; 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.:"
-echo -e "      $item if [[ -s $rvm_path/scripts/rvm ]] ; then source $rvm_path/scripts/rvm ; fi"
-echo -e "      $item CLOSE THIS SHELL AND OPEN A NEW ONE in order to use rvm."
+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 "    $item if [[ -s $rvm_path/scripts/rvm ]] ; then source $rvm_path/scripts/rvm ; fi"
+echo -e "    $item CLOSE THIS SHELL AND OPEN A NEW ONE in order to use rvm."
 
-echo -e "\n    \033[0;33mRTFM: $(tput sgr0) http://rvm.beginrescueend.com/ \n"
+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 "\n    ~ Wayne\n"
 
-source $rvm_path/scripts/rvm
-rvm -v
-echo
+$rvm_path/bin/rvm -v
 
 exit 0

data/scripts/utility

@@ -34,22 +34,22 @@ Info
 }
 
 __rvm_debug() {
-  __rvm_log "debug" "PATH:\n$(echo $PATH | awk -F":" '{print $1":"$2":"$3":"$4":"$5}')"
-  __rvm_log "debug" "uname -a: $(uname -a)"
+  $rvm_scripts_path/log "debug" "PATH:\n$(echo $PATH | awk -F":" '{print $1":"$2":"$3":"$4":"$5}')"
+  $rvm_scripts_path/log "debug" "uname -a: $(uname -a)"
 
   if [[ "Darwin" = "$(uname)" ]] ; then
-    __rvm_log "debug" "uname -r: $(uname -r)"
-    __rvm_log "debug" "uname -m: $(uname -m)"
-    __rvm_log "debug" "sw_vers: $(sw_vers | tr "\n" ',')"
-    __rvm_log "debug" "ARCHFLAGS: $ARCHFLAGS"
-    __rvm_log "debug" "LDFLAGS: $LDFLAGS"
-    __rvm_log "debug" "CFLAGS: $CFLAGS"
-    __rvm_log "debug" "/Developer/SDKs/*:$(basename -a /Developer/SDKs/* | tr "\n" ',')"
+    $rvm_scripts_path/log "debug" "uname -r: $(uname -r)"
+    $rvm_scripts_path/log "debug" "uname -m: $(uname -m)"
+    $rvm_scripts_path/log "debug" "sw_vers: $(sw_vers | tr "\n" ',')"
+    $rvm_scripts_path/log "debug" "ARCHFLAGS: $ARCHFLAGS"
+    $rvm_scripts_path/log "debug" "LDFLAGS: $LDFLAGS"
+    $rvm_scripts_path/log "debug" "CFLAGS: $CFLAGS"
+    $rvm_scripts_path/log "debug" "/Developer/SDKs/*:$(basename -a /Developer/SDKs/* | tr "\n" ',')"
   fi
 
   for file_name in $(echo $rc_files) ; do
     if [[ -s "$file_name" ]] ; then
-      __rvm_log "debug" "$file_name:\n$(grep 'rvm' $file_name)"
+      $rvm_scripts_path/log "debug" "$file_name:\n$(grep 'rvm' $file_name)"
     fi
   done
 
@@ -61,32 +61,11 @@ __rvm_debug() {
 
   for file_name in $(echo $debug_files); do
     if [[ -f "$file_name" ]] && [[ -s "$file_name" ]] ; then
-      __rvm_log "debug" "$file_name (filtered):\n$(cat $file_name | awk '!/assword|_key/')\n"
+      $rvm_scripts_path/log "debug" "$file_name (filtered):\n$(cat $file_name | awk '!/assword|_key/')\n"
     fi
   done
 
-  __rvm_log "debug" "gem sources:\n$(gem sources | awk '/gems/')"
-
-  if [[ -f "$rvm_path/bin/rvm" ]] ; then
-    __rvm_log "error" "rvm script in bin! \n$(\ls -laht $rvm_path/bin/rvm)"
-  fi
-}
-
-# Logging functions based on level
-# TODO: Allow specification of a base file name to output to.
-__rvm_log() {
-  if [[ ! -z "$2" ]] ; then level=$1 ; shift ; else level="info" ; fi
-  message=$1
-  case "$level" in
-    debug) shift ;
-      ((rvm_debug_flag)) && 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) " ;;
-    fail)  shift ; echo -e "$(tput setaf 1)<f>$(tput sgr0) $message $(tput setaf 1)</f> $(tput sgr0) " ; __rvm_pushpop ; return 1 ;;
-    *) echo -e "$message"
-  esac
+  $rvm_scripts_path/log "debug" "gem sources:\n$(gem sources | awk '/gems/')"
 }
 
 if [[ ! -z "$ZSH_VERSION" ]] ; then __shell_array_start=1 ; else __shell_array_start=0 ; fi
@@ -115,8 +94,8 @@ __rvm_run() {
   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"
+  if [[ ! -z "$message" ]] ; then $rvm_scripts_path/log "info" "$message" ; fi
+  (( $rvm_debug_flag )) && $rvm_scripts_path/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"
   if [[ -z "$rvm_niceness" ]] || [[ "0" = "$rvm_niceness" ]] ; then
@@ -124,17 +103,17 @@ __rvm_run() {
   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
-  if [[ $? -gt 0 ]] ; then __rvm_log "error" "Error running '$command', please check $rvm_ruby_log_path/$log_file_name.error.log" ; __rvm_pushpop ; return 1 ; fi
+  if [[ $? -gt 0 ]] ; then $rvm_scripts_path/log "error" "Error running '$command', please check $rvm_ruby_log_path/$log_file_name.error.log" ; __rvm_pushpop ; return 1 ; fi
   unset log_file command
 }
 
 __rvm_cleanup_variables() {
   __rvm_unset_ruby_variables
-  unset rvm_ruby_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_tail_flag rvm_use_flag rvm_dir_flag rvm_list_flag rvm_empty_flag rvm_log_path rvm_file_name rvm_benchmark_flag rvm_clear_flag rvm_name_flag rvm_verbose_flag rvm_user_flag rvm_system_flag rvm_ruby_configure_flags CFLAGS LDFLAGS ARCHFLAGS
+  unset rvm_ruby_selected_flag rvm_action rvm_irbrc_file rvm_command rvm_error_message rvm_gem_set_name rvm_url 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_tail_flag rvm_use_flag rvm_dir_flag rvm_list_flag rvm_empty_flag rvm_file_name rvm_benchmark_flag rvm_clear_flag rvm_name_flag rvm_verbose_flag rvm_user_flag rvm_system_flag rvm_ruby_configure_flags CFLAGS LDFLAGS ARCHFLAGS
 }
 
 __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_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_ruby_selected_flag rvm_ruby_string rvm_ruby_string rvm_ruby_src_path rvm_ruby_repo_url rvm_major_version rvm_minor_version rvm_ruby_gem_home rvm_head_flag rvm_ruby_configure
+  unset rvm_ruby_interpreter rvm_ruby_version rvm_ruby_repo_url rvm_ruby_package_name rvm_ruby_patch_level 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_ruby_selected_flag rvm_ruby_string rvm_ruby_string rvm_ruby_src_path rvm_ruby_repo_url rvm_major_version rvm_minor_version rvm_ruby_gem_home rvm_head_flag rvm_ruby_configure rvm_ruby_mode
 }
 
 __rvm_load_rvmrc() {
@@ -171,62 +150,6 @@ RubyWrapper
   chmod +x $rvm_path/bin/$rvm_ruby_package_name
 }
 
-__rvm_fetch() {
-  __rvm_pushpop $rvm_archives_path
-  if [[ -z "$1" ]] ; then log "fail" "BUG: __rvm_fetch called without an argument :/" ; return 1 ; fi
-  archive=$(basename "$1") ; downlaod=1
-  __rvm_log "debug" "Fetching $archive"
-  # Check first if we have the correct archive
-  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
-      __rvm_log "debug" "Archive is bad, downloading"
-      download=1
-    else
-      __rvm_log "debug" "Archive is good, not downloading"
-      download=0
-      result=0
-    fi
-  else
-    __rvm_log "debug" "No archive or no MD5, downloading"
-    download=1
-  fi
-  if [[ $download -gt 0 ]] ; then
-    eval $rvm_fetch "$1"
-    result=$?
-    if [[ $result -gt 0 ]] ; then
-      retry=0
-      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"
-        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
-      fi
-
-    fi
-    __rvm_pushpop
-  fi
-
-  unset archive
-  unset download
-  return $result
-}
-
 __rvm_load_defaults() {
   if [[ ! -s "$rvm_path/system" ]] ; then
     for variable in RUBY_VERSION GEM_HOME GEM_PATH MY_RUBY_HOME ; do
@@ -241,24 +164,24 @@ __rvm_load_defaults() {
     done
   fi
 
-  rvm_system_ruby=$(__rvm_db "system_ruby")
+  rvm_system_ruby=$($rvm_scripts_path/db "$rvm_config_path/db" "system_ruby")
   if [[ ! -z "$rvm_system_ruby" ]] ; then
     rvm_system_ruby=$(which ruby)
     if [[ $? -ne 0 ]] ; then
-      __rvm_log "info" "System ruby not found, no db will be stored."
+      $rvm_scripts_path/log "info" "System ruby not found, no db will be stored."
     else
-      __rvm_db "system_ruby" "$rvm_system_ruby"
+      $rvm_scripts_path/db "$rvm_config_path/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_scripts_path/db "$rvm_config_path/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"
+        $rvm_scripts_path/db "$rvm_config_path/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_scripts_path/db "$rvm_config_path/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"
+        $rvm_scripts_path/db "$rvm_config_path/db" "system_gem_path" "$rvm_system_gem_path"
       fi
     fi
   fi
@@ -277,7 +200,7 @@ __rvm_reset() {
   __rvm_select
 
   for system_config in system_ruby system_gem_path system_user_gem_path ; do
-    __rvm_db "$system_config" "delete"
+    $rvm_scripts_path/db "$rvm_config_path/db" "$system_config" "delete"
   done ; unset system_config variable
 
   rm -f $rvm_path/bin/ruby $rvm_path/bin/gem $rvm_path/bin/rake $rvm_path/bin/irb $rvm_path/bin/default*
@@ -285,23 +208,23 @@ __rvm_reset() {
 
 __rvm_implode() {
   while : ; do
-    __rvm_log "warn" "Are you SURE you wish for rvm to implode? This will remove $rvm_path ? (type 'yes' or 'no')"
+    $rvm_scripts_path/log "warn" "Are you SURE you wish for rvm to implode? This will remove $rvm_path ? (type 'yes' or 'no')"
     read response
     if [[ "yes" = "$response" ]] ; then
       if [[ "/" = "$rvm_path" ]] ; then
-        __rvm_log "error" "remove '/' ?!... NO!"
+        $rvm_scripts_path/log "error" "remove '/' ?!... NO!"
       else
         if [[ -d "$rvm_path" ]] ; then
-          __rvm_log "info" "Hai! Removing $rvm_path"
+          $rvm_scripts_path/log "info" "Hai! Removing $rvm_path"
           rm -rf $rvm_path/
-          __rvm_log "info" "$rvm_path has been removed."
+          $rvm_scripts_path/log "info" "$rvm_path has been removed."
         else
-          __rvm_log "info" "It appears that $rvm_path is already non existant."
+          $rvm_scripts_path/log "info" "It appears that $rvm_path is already non existant."
         fi
       fi
       break
     elif [[ "no" = "$response" ]] ; then
-      __rvm_log "info" "Cancelling implosion, no harm done :)"
+      $rvm_scripts_path/log "info" "Cancelling implosion, no harm done :)"
       break
     fi
   done
@@ -310,75 +233,12 @@ __rvm_implode() {
 __rvm_source_dir() {
   if [[ -z "$rvm_ruby_selected_flag" ]] ; then __rvm_select $* ; fi
   if [[ -z "$rvm_ruby_src_path" ]] ; then
-    __rvm_log "fail" "No source directory exists for the default implementation."
+    $rvm_scripts_path/log "fail" "No source directory exists for the default implementation."
   else
     echo "$rvm_ruby_src_path"
   fi
 }
 
-# clones from source implementation/version to default
-# TODO: Merge this into 'rvm sync'
-__rvm_gemdup() {
-  if [[ -z "$rvm_ruby_selected_flag" ]] ; then __rvm_select $* ; fi
-  __rvm_log "debug" "$rvm_ruby_interpreter"
-  if [[ "default" = "$rvm_ruby_interpreter" ]] ; then
-    # TODO: $rvm_path/default first, then system user
-    rvm_source_gem_path="$rvm_system_user_gem_path"
-  elif [[ "user" = "$rvm_ruby_interpreter" ]] ; then
-    rvm_source_gem_path="$rvm_system_user_gem_path"
-  elif [[ "system" = "$rvm_ruby_interpreter" ]] ; then
-    rvm_source_gem_path="$rvm_system_gem_path"
-  else
-    # TODO: use selector for this?
-    rvm_source_gem_path=${rvm_ruby_gem_home/$rvm_ruby_interpreter/$rvm_ruby_version}
-  fi
-  __rvm_gem_sync
-}
-
-__rvm_gem_sync() {
-  if [[ ! -z "$rvm_source_gem_path" ]] ; then
-    for rvm_gem_name_version in $rvm_source_gem_path/gems/* ; do
-      rvm_gem_name_version=$(basename $rvm_gem_name_version)
-      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"
-      fi
-    done
-    unset rvm_gem_name_version rvm_gem_name rvm_gem_version
-  else
-    __rvm_log "fail" "Unknown ruby selected :("
-    result=1
-  fi
-}
-
-__rvm_db() {
-  rvm_hash_file="$rvm_config_path/db"
-  touch $rvm_hash_file
-  key="$1" ; shift
-
-  if [[ -z "$key" ]] ; then
-    __rvm_log "fail" "__rvm_db must be called with at least one argument: __rvm_db key [value]"
-  else
-    value="$*"
-    if [[ "unset" = "$value" ]] || [[ "delete" = "$value" ]] ; then
-      sed -i.tmp "s#^$key=.*\$##" $rvm_hash_file
-    else
-      if [[ -z "$value" ]] ; then # get
-        awk -F= '/^'"$key"'=/{print $2}' $rvm_hash_file
-      else # set
-        if [[ -z "$(awk -F= "/^'"$key"'=/{print $2}" $rvm_hash_file)" ]] ; then # append
-          echo "$key=$value" >> $rvm_hash_file
-        else # overwrite
-          sed -i.tmp "s#^$key=.*\$#$key=$value#" $rvm_hash_file
-        fi
-      fi
-    fi
-  fi
-}
-
 __rvm_list() {
   if [[ ! -z "$rvm_all_flag" ]] ; then
     while read -r tag
@@ -488,50 +348,11 @@ __rvm_list() {
 }
 
 __rvm_initialize() {
-  # TODO: Sanitize user input, ensure that there is a / a the end...
-  if [[ "root" = "$(whoami)" ]] ; then
-    rvm_prefix_path="${rvm_prefix_path:-/usr/local/}"
-    rc_files="/etc/profile /etc/zshenv"
-  else
-    if [[ -f "$HOME/.rvm/scripts/rvm" ]] ; then
-      rvm_prefix_path="${rvm_prefix_path:-"$HOME/."}"
-    else
-      rvm_prefix_path="${rvm_prefix_path:-"/usr/local/"}"
-    fi
-    rc_files="$HOME/.bash_profile $HOME/.bashrc $HOME/.zshrc"
-  fi
-
-  if [[ "${rvm_prefix_path#${rvm_prefix_path%?}}" = '.' ]] || [[ "${rvm_prefix_path#${rvm_prefix_path%?}}" = '/' ]] ; then
-    rvm_path="${rvm_prefix_path}rvm"
-  else
-    rvm_path="${rvm_prefix_path}/rvm"
-  fi
-
-  rvm_archives_path="${rvm_archives_path:-"$rvm_path/archives"}"
-  rvm_src_path="${rvm_src_path:-"$rvm_path/src"}"
-  rvm_log_path="${rvm_log_path:-"$rvm_path/log"}"
-  rvm_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.
-  rvm_rubinius_repo_url="${rvm_rubinius_repo_url:-"git://github.com/evanphx/rubinius.git"}"
-  rvm_shyouhei_repo_url="${rvm_shyouhei_repo_url:-"git://github.com/shyouhei/ruby.git"}"
-  rvm_jruby_repo_url="${rvm_jruby_repo_url:-"git://kenai.com/jruby~main"}"
   rvm_ruby_load_path="."
   rvm_ruby_require=""
 
   __rvm_clean_path
 
-  rvm_fetch=$(which curl)
-  if [[ $? -ne 0 ]] ; then
-    __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
-
   rvm_result=$(echo $PATH | grep 'rvm\/bin:')
   if [[ -z "$rvm_result" ]] ; then
     PATH=$rvm_bin_path:$PATH ; export PATH
@@ -554,9 +375,9 @@ __rvm_update_rvm() {
   __rvm_pushpop "$rvm_src_path"
   if [[ "head" = "$rvm_ruby_revision" ]] ; then
     if [[ -d "$rvm_src_path/rvm/.git" ]] ; then
-      cd $rvm_src_path/rvm/ && git pull origin master && ./scripts/install
+      builtin cd $rvm_src_path/rvm/ && git pull origin master && ./scripts/install
     else
-      cd $rvm_src_path && git clone git://github.com/wayneeseguin/rvm.git && cd rvm/ && ./install
+      builtin cd $rvm_src_path && git clone git://github.com/wayneeseguin/rvm.git && builtin cd rvm/ && ./install
     fi
   else
     # TODO: rvm_install_path:
@@ -566,14 +387,14 @@ __rvm_update_rvm() {
 }
 
 __rvm_reboot() {
-  __rvm_log "warn" "Do you wish to reset rvm? ('yes', or 'no')"
+  $rvm_scripts_path/log "warn" "Do you wish to reset rvm? ('yes', or 'no')"
   read response
   if [[ "yes" = "$response" ]] ; then
-    cd $rvm_path
+    builtin cd $rvm_path
     __rvm_reset
     mv $rvm_path/archives ~/.archives
     if [[ "/" = "$rvm_path" ]] ; then
-      __rvm_log "error" "remove '/' ?!... NO!"
+      $rvm_scripts_path/log "error" "remove '/' ?!... NO!"
     else
       if [[ -d "$rvm_path" ]] ; then rm -rf "$rvm_path/" ; fi
     fi
@@ -581,7 +402,7 @@ __rvm_reboot() {
     __rvm_update_rvm
     source $rvm_path/scripts/rvm
   else
-    __rvm_log "info" "Carry on then..."
+    $rvm_scripts_path/log "info" "Carry on then..."
   fi ; unset response
 }
 
@@ -594,25 +415,30 @@ __rvm_ruby_do() {
   elif [[ "system" = "$rvm_ruby_string" ]] && [[ -x "$(which $binary)" ]] ; then
     binary="$(which $binary)"
   else
-    __rvm_log "warn" "'$binary not found for $rvm_ruby_string' either does not exist or is not executable? :("
+    $rvm_scripts_path/log "warn" "'$binary not found for $rvm_ruby_string' either does not exist or is not executable? :("
     __rvm_unset_ruby_variables
     return 1
   fi
 
+  if [[ ! -z "$rvm_ruby_mode" ]] ; then
+    rvm_ruby_string="$rvm_ruby_string-$rvm_ruby_mode"
+    rvm_ruby_mode="--$(echo $rvm_ruby_mode | sed 's/^m//')"
+  fi
+
   load_path="$rvm_ruby_home/bin:$rvm_ruby_load_path"
   # TODO: the else case below should be run if $rvm_ruby_args =~ /\.rb$/
   if [[ "ruby" = "$binary" ]] && [[ "$rvm_benchmark_flag" -ne 1 ]] ; then
-    if match "$rvm_ruby_args" "\.rb$" ; then
+    if $rvm_scripts_path/match "$rvm_ruby_args" "\.rb$" ; then
       if [[ -z "$prefix" ]] ; then prefix="-S" ; fi
-      if ! match "$rvm_ruby_args" "$prefix" ; then
+      if ! $rvm_scripts_path/match "$rvm_ruby_args" "$prefix" ; then
         rvm_ruby_args="$prefix $rvm_ruby_args"
       fi
     fi
-    rvm_command="$binary $rvm_ruby_require -I$load_path $rvm_ruby_args"
+    rvm_command="$binary $rvm_ruby_mode $rvm_ruby_require -I$load_path $rvm_ruby_args"
   elif [[ "gem" = "$binary" ]] && match "$rvm_ruby_args" '^install' ; then
-    rvm_command="$binary $rvm_ruby_args --no-rdoc --no-ri"
+    rvm_command="$binary $rvm_ruby_mode $rvm_ruby_args --no-rdoc --no-ri"
   else
-    rvm_command="$binary $rvm_ruby_args"
+    rvm_command="$binary $rvm_ruby_mode $rvm_ruby_args"
   fi
 
   if [[ ! -z "$rvm_json_flag" ]] || [[ ! -z "$rvm_yaml_flag" ]] || [[ ! -z "$rvm_summary_flag" ]] ; then
@@ -620,7 +446,7 @@ __rvm_ruby_do() {
     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: $($rvm_ruby_home/bin/ruby -v | tr "\n" ' ')\033[0m\n"
+    echo -e "\n\n\033[0;32m$rvm_ruby_string: $($rvm_ruby_home/bin/ruby -v $rvm_ruby_mode | tr "\n" ' ')\033[0m\n"
     eval "$rvm_command"
   fi
   result=$?
@@ -693,7 +519,7 @@ __rvm_yaml() {
   total=${#rubies[*]}
   if [[ ! -z "$ZSH_VERSION" ]] ; then array_start=1 ; else array_start=0 ; fi
   for (( index = $array_start ; index < $total + $array_start ; index++ )) ; do
-    __rvm_log "debug" "${rubies[$index]}: ${statuses[$index]}"
+    (( $rvm_debug_flag )) && $rvm_scripts_path/log "debug" "${rubies[$index]}: ${statuses[$index]}"
     yaml="$yaml\n  \"${rubies[$index]}\": ${statuses[$index]}"
   done ; unset index array_start
   mkdir -p log
@@ -712,7 +538,7 @@ __rvm_json() {
   total=${#rubies[*]}
   if [[ ! -z "$ZSH_VERSION" ]] ; then array_start=1 ; else array_start=0 ; fi
   for (( index = $array_start ; index < $total + $array_start ; index++ )) ; do
-    __rvm_log "debug" "${rubies[$index]}: ${statuses[$index]}"
+    (( $rvm_debug_flag )) && $rvm_scripts_path/log "debug" "${rubies[$index]}: ${statuses[$index]}"
     json="$json\n    {\"${rubies[$index]}\": ${statuses[$index]}}"
     if (( $index + 1 < $total + $array_start )) ; then json="$json,  " ; fi
   done ; unset index array_start
@@ -770,7 +596,7 @@ __rvm_state() {
 __rvm_inspect() {
   for binary in $rvm_ruby_args ; do
     actual_file=$(which $binary)
-    __rvm_log "info" "$actual_file:"
+    $rvm_scripts_path/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
     if [[ ! -z "$rvm_path_flag" ]]    ; then cat $actual_file | awk '/PATH/' ; fi
@@ -788,10 +614,11 @@ __rvm_readline_install() {
   __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_scripts_path/log "info" "Retrieving $package-$version.$archive_format"
+  $rvm_scripts_path/fetch "ftp://ftp.gnu.org/gnu/readline/$package-$version.$archive_format"
+  result=$? ; if [[ "$result" -gt 0 ]] ; then return $result ; fi
   __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"
+  builtin cd "$rvm_src_path/$package-$version"
   if [[ "Darwin" = "$(uname)" ]] ; then
     #sdk=$(\ls -t /Developer/SDKs/ | head -n 1)
     #CFLAGS="-isysroot /Developer/SDKs/$sdk -arch i386 -arch x86_64"
@@ -810,10 +637,11 @@ __rvm_iconv_install() {
   __rvm_make_flags
   __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_scripts_path/log "info" "Retrieving $package-$version.$archive_format"
+  $rvm_scripts_path/fetch "http://ftp.gnu.org/pub/gnu/libiconv/$package-$version.$archive_format"
+  result=$? ; if [[ "$result" -gt 0 ]] ; then return $result ; fi
   __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"
+  builtin cd "$rvm_src_path/$package-$version"
   __rvm_run "$package/configure" "./configure --prefix=$rvm_path/usr" "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"
@@ -824,30 +652,31 @@ __rvm_curl_install() {
   __rvm_make_flags
   __rvm_pushpop $rvm_src_path
   package="curl" ; version=7.19.7 ; archive_format="tar.gz"
-  __rvm_log "info" "Retrieving $package-$version.$archive_format"
-  __rvm_fetch "http://curl.haxx.se/download/$package-$version.$archive_format"
+  $rvm_scripts_path/log "info" "Retrieving $package-$version.$archive_format"
+  $rvm_scripts_path/fetch "http://curl.haxx.se/download/$package-$version.$archive_format"
+  result=$? ; if [[ "$result" -gt 0 ]] ; then return $result ; fi
   __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"
+  builtin cd "$rvm_src_path/$package-$version"
   __rvm_run "$package/configure" "./configure --prefix=$rvm_path/usr" "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_openssl_install() {
   __rvm_make_flags
-    if match "$rvm_archflags" "x86_64" ; then
+    if $rvm_scripts_path/match "$rvm_archflags" "x86_64" ; then
       openssl_os="os/compiler darwin64-x86_64-cc"
     else
       openssl_os="os/compiler darwin-i386-cc"
     fi
   __rvm_pushpop $rvm_src_path
   package="openssl" ; version="0.9.8k" ; archive_format="tar.gz"
-  __rvm_log "info" "Retrieving $package-$version.$archive_format"
-  __rvm_fetch "http://www.openssl.org/source/$package-$version.tar.gz"
+  $rvm_scripts_path/log "info" "Retrieving $package-$version.$archive_format"
+  $rvm_scripts_path/fetch "http://www.openssl.org/source/$package-$version.tar.gz"
+  result=$? ; if [[ "$result" -gt 0 ]] ; then return $result ; fi
   __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"
+  builtin cd "$rvm_src_path/$package-$version"
   __rvm_run "$package/config" "./config --prefix=$rvm_path/usr zlib no-asm no-krb5 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"
@@ -858,10 +687,11 @@ __rvm_zlib_install() {
   __rvm_make_flags
   __rvm_pushpop $rvm_src_path
   package="zlib" ; version="1.2.3" ; archive_format="tar.gz"
-  __rvm_log "info" "Retrieving $package-$version.$archive_format"
-  __rvm_fetch "http://www.zlib.net/$package-$version.tar.gz"
+  $rvm_scripts_path/log "info" "Retrieving $package-$version.$archive_format"
+  $rvm_scripts_path/fetch "http://www.zlib.net/$package-$version.tar.gz"
+  result=$? ; if [[ "$result" -gt 0 ]] ; then return $result ; fi
   __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"
+  builtin cd "$rvm_src_path/$package-$version"
   __rvm_run "$package/configure" "./configure --prefix=$rvm_path/usr" "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"
@@ -872,10 +702,11 @@ __rvm_ncurses_install() {
   __rvm_make_flags
   __rvm_pushpop $rvm_src_path
   package="ncurses" ; version="5.7" ; archive_format="tar.gz"
-  __rvm_log "info" "Retrieving $package"
-  __rvm_fetch "ftp://invisible-island.net/ncurses/ncurses.tar.gz"
+  $rvm_scripts_path/log "info" "Retrieving $package"
+  $rvm_scripts_path/fetch "ftp://invisible-island.net/ncurses/ncurses.tar.gz"
+  result=$? ; if [[ "$result" -gt 0 ]] ; then return $result ; fi
   __rvm_run "$package/extract" "tar zxf $rvm_archives_path/$package.$archive_format -C $rvm_src_path" "Extracting $package.$archive_format"
-  cd "$rvm_src_path/$package-$version"
+  builtin cd "$rvm_src_path/$package-$version"
   __rvm_run "$package/configure" "./configure --prefix=$rvm_path/usr --with-shared --disable-rpath --without-debug --without-ada --enable-safe-sprintf --enable-sigwinch --without-progs" "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"
@@ -980,18 +811,3 @@ array_push() {
   eval "index=\$((\${#${array}[*]} + $__array_start))"
   eval "${array}[${index}]=${item}"
 }
-
-match() {
-  #if [[ ! -z "$BASH_VERSION" ]] && [[ ${BASH_VERSION:0:1} -gt 2 ]] && [[ ${BASH_VERSION:2:1} -ge 1 ]] ; then
-    #[[ "$1" =~ $2 ]] ; return $?
-  # elif [[ ! -z "$ZSH_VERSION"]] && [[ ${ZSH_VERSION:0:1} -gt 3 ]] && [[ ${ZSH_VERSION:2:1} -ge 2 ]] && [[ ${ZSH_VERSION:4:1} -ge 4 ]] ; then
-  # return [[ "$1" =~ "$2" ]]
-  #else
-  if [ ! -z "$(echo "$1" | awk "/${2}/")" ] ; then
-    return 0
-  else
-    return 1
-  fi
-  #fi
-}
-