rvm 1.0.7 → 1.0.8

data/scripts/hook

@@ -4,11 +4,11 @@ declare rvm_verbose_flag=${rvm_verbose_flag:-0}
 declare rvm_hook=${rvm_hook:-""}
 
 if [[ -n "$rvm_hook" ]] ; then
-  if [[ -s "$rvm_hooks_path/$rvm_hook" ]] ; then
+  if [[ -s "$rvm_path/hooks/$rvm_hook" ]] ; then
     if [[ ${rvm_verbose_flag:-0} -gt 0 || ${rvm_debug_flag:-0} -gt 0 ]] ; then
       "$rvm_path/scripts/log" "info" "running hook $rvm_hook"
     fi
-    source "$rvm_hooks_path/$rvm_hook"
+    source "$rvm_path/hooks/$rvm_hook"
   fi
 fi
 unset rvm_hook

data/scripts/info

@@ -125,9 +125,9 @@ $(__rvm_version)
   done
 
   if [[ "$rvm_selfcontained" = "0" ]] ; then
-    debug_files="$rvm_config_path/alias $rvm_config_path/system $rvm_config_path/db /etc/rvmrc /etc/gemrc"
+    debug_files="$rvm_path/config/alias $rvm_path/config/system $rvm_path/config/db /etc/rvmrc /etc/gemrc"
   else
-    debug_files="$rvm_config_path/alias $rvm_config_path/system $rvm_config_path/db $HOME/.rvmrc $HOME/.gemrc"
+    debug_files="$rvm_path/config/alias $rvm_path/config/system $rvm_path/config/db $HOME/.rvmrc $HOME/.gemrc"
   fi
 
   for file_name in $(echo $debug_files); do
@@ -152,21 +152,32 @@ sections="${args// /}"
 all_sections="system rvm ruby homes binaries environment"
 
 if "$rvm_path/scripts/match" "$all_sections debug" "${ruby_strings/,*/}" ; then
+
   sections="$ruby_strings"
   ruby_strings=""
+
 fi
 
 if [[ -z "${sections// /}" ]] ; then sections="$all_sections" ; fi
 
 if [[ -z "$ruby_strings" ]] ; then
+
   printf "\n$(__rvm_environment_identifier):\n"
+
   info_sections
+
 else
+
   for ruby_string in $(printf ${ruby_strings//,/ }) ; do
+
     __rvm_become "$ruby_string"
+
     printf "\n$(__rvm_environment_identifier):\n"
+
     info_sections
+
   done
+
 fi
 
 exit 0

data/scripts/initialize

@@ -16,33 +16,14 @@ if [[ ${rvm_selfcontained:-1} -eq 0 ]] ; then
   rvm_man_path="${rvm_man_path:-"${rvm_prefix}share/man"}"
   rvm_rc_files="${rvm_rc_files:-"/etc/profile /etc/zshenv"}"
 else
-  rvm_man_path="${rvm_man_path:-"$rvm_path/man"}"
   rvm_bin_path="${rvm_bin_path:-"$rvm_path/bin"}"
+  rvm_man_path="${rvm_man_path:-"$rvm_path/man"}"
   rvm_rc_files="${rvm_rc_files:-"$HOME/.bash_profile $HOME/.bashrc $HOME/.zshenv"}"
 fi
 
 [[ -n "${rvm_archflags:-""}" ]] && rvm_make_flags_flag=1
 
-rvm_archives_path="${rvm_archives_path:-"$rvm_path/archives"}"
-rvm_src_path="${rvm_src_path:-"$rvm_path/src"}"
-rvm_repo_path="${rvm_repo_path:-"$rvm_path/repos"}"
-rvm_log_path="${rvm_log_path:-"$rvm_path/log"}"
-rvm_docs_path="${rvm_docs_path:-"$rvm_path/docs"}"
-
-rvm_gems_path="${rvm_gems_path:-"$rvm_path/gems"}" # Leave this one in global, need to override for system installs (for now).
-
-rvm_gems_cache_path="${rvm_gems_cache_path:-"$rvm_gems_path/cache"}"
-rvm_rubies_path="${rvm_rubies_path:-"$rvm_path/rubies"}"
-rvm_config_path="${rvm_config_path:-"$rvm_path/config"}"
-rvm_environments_path="${rvm_environments_path:-"$rvm_path/environments"}"
-rvm_wrappers_path="${rvm_wrappers_path:-"$rvm_path/wrappers"}"
-rvm_hooks_path="${rvm_hooks_path:-"$rvm_path/hooks"}"
-
-rvm_tmp_path="${rvm_tmp_path:-"$rvm_path/tmp"}"
-rvm_usr_path="${rvm_usr_path:-"$rvm_path/usr"}"
-
-rvm_project_rvmrc="${rvm_project_rvmrc:-1}"
-rvm_project_rvmrc_default="${rvm_project_rvmrc_default:-0}"
+rvm_gems_cache_path="${rvm_gems_cache_path:-"${rvm_gems_path:-"$rvm_path/gems"}/cache"}"
 
-export rvm_path rvm_rubies_path rvm_archives_path rvm_src_path rvm_log_path rvm_bin_path rvm_gems_path rvm_config_path rvm_tmp_path rvm_hooks_path rvm_gems_cache_path rvm_gemset_separator rvm_repo_path rvm_selfcontained
+export rvm_path rvm_bin_path rvm_gems_cache_path rvm_gemset_separator rvm_selfcontained
 

data/scripts/install

@@ -194,9 +194,6 @@ question="\n<?>"
 cwd="$PWD"
 
 source_path="${source_path:-$cwd}"
-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"}"
 
 if [[ "$rvm_selfcontained" = "0" ]] ; then
   rvm_bin_path="${rvm_bin_path:-"${rvm_prefix}bin"}"
@@ -209,9 +206,6 @@ else
 fi
 
 rvm_gems_path="${rvm_gems_path:-"$rvm_path/gems"}"
-rvm_rubies_path="${rvm_rubies_path:-"$rvm_path/rubies"}"
-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"}"
 
 printf "
@@ -230,7 +224,9 @@ else
 
 fi
 
-for directory in "$rvm_archives_path" "$rvm_src_path" "$rvm_log_path" "$rvm_bin_path" "$rvm_gems_path" "$rvm_rubies_path" "$rvm_config_path" "$rvm_hooks_path" "$rvm_tmp_path" ; do
+directories=( "${rvm_archives_path:-"$rvm_path/archives"}" "${rvm_src_path:-"$rvm_path/src"}" "${rvm_log_path:-"$rvm_path/log"}" "$rvm_bin_path" "${rvm_gems_path:-"$rvm_path/gems"}" "${rvm_rubies_path:-"$rvm_path/rubies"}" "$rvm_path/config" "${rvm_tmp_path:-"$rvm_path/tmp"}" )
+
+for directory in "${directories[@]}" ; do
 
   if [[ ! -d "$directory" ]] ; then
 
@@ -240,7 +236,9 @@ for directory in "$rvm_archives_path" "$rvm_src_path" "$rvm_log_path" "$rvm_bin_
 
 done
 
-for file in README LICENCE ; do
+files=(README LICENCE)
+
+for file in "${files[@]}"; do
 
   cp -f "$source_path/$file" "$rvm_path/"
 
@@ -265,8 +263,8 @@ for dir_name in config scripts examples lib hooks help patches; do
 
 done
 
-if [[ ! -s "$rvm_config_path/user" ]] ; then
-  echo '# Users settings file, overrides db file settings and persists across installs.' >> "$rvm_config_path/user"
+if [[ ! -s "$rvm_path/config/user" ]] ; then
+  echo '# Users settings file, overrides db file settings and persists across installs.' >> "$rvm_path/config/user"
 fi
 
 scripts=(monitor match log install color db fetch log set package)
@@ -281,15 +279,17 @@ done
 # Bin Scripts
 #
 # Cleanse and purge...
-for file in rvm-prompt rvm rvmsudo rvm-shell rvm-auto-ruby ; do
+files=(rvm-prompt rvm rvmsudo rvm-shell rvm-auto-ruby)
+
+for file in "${files[@]}" ; do
 
   rm -f "$rvm_bin_path/$file"
 
-  cp -f "$source_path/binscripts/$file" $rvm_bin_path/
+  cp -f "$source_path/binscripts/$file" "${rvm_bin_path:-"$rvm_path/bin"}/"
 
 done
 
-chmod +x "$rvm_bin_path"/* # TODO: this is quite suboptimal.
+chmod +x "${rvm_bin_path:-"$rvm_path/bin"}"/* # TODO: this is quite suboptimal.
 
 #
 # RC Files
@@ -389,17 +389,15 @@ fi
 #
 # Migrate ~/.rvm/ruby-X,jruby-X,... to ~/.rvm/rubies/ for 0.1.0.
 #
-rvm_rubies_path="${rvm_rubies_path:-"$rvm_path/rubies"}"
-
-mkdir -p "$rvm_rubies_path/"
+mkdir -p "${rvm_rubies_path:-"$rvm_path/rubies"}/"
 
 for ruby in $rvm_path/ruby-* $rvm_path/jruby-* $rvm_path/mput-* $rvm_path/rbx-* $rvm_path/maglev-* $rvm_path/ree-* ; do
 
   if [[ -d "$ruby" ]] ; then
 
-    mv "$ruby" "$rvm_rubies_path/"
+    mv "$ruby" "${rvm_rubies_path:-"$rvm_path/rubies"}/"
 
-    new_path="$rvm_rubies_path/$(basename $ruby)"
+    new_path="${rvm_rubies_path:-"$rvm_path/rubies"}/$(basename $ruby)"
 
     for file in gem rake ; do
 
@@ -468,9 +466,9 @@ for gemset in "$rvm_path"/gems/*\@ ; do
 done
 
 # Move from legacy defaults to the new, alias based system.
-if [[ -s "$rvm_config_path/default" ]]; then
+if [[ -s "$rvm_path/config/default" ]]; then
 
-  original_version="$(basename "$(grep GEM_HOME "$rvm_config_path/default" | awk -F"'" '{print $2}' | sed "s#\%#${rvm_gemset_separator:-"@"}#")")"
+  original_version="$(basename "$(grep GEM_HOME "$rvm_path/config/default" | awk -F"'" '{print $2}' | sed "s#\%#${rvm_gemset_separator:-"@"}#")")"
 
   if [[ -n "$original_version" ]]; then
 
@@ -478,7 +476,7 @@ if [[ -s "$rvm_config_path/default" ]]; then
 
   fi ; unset original_version
 
-  rm -rf "$rvm_config_path/default"
+  rm -rf "$rvm_path/config/default"
 
 fi
 
@@ -487,11 +485,11 @@ fi
 #
 printf "\n    Correct permissions for base binaries in $rvm_bin_path..."
 
-mkdir -p "$rvm_bin_path"
+mkdir -p "${rvm_bin_path:-"$rvm_path/bin"}"
 
 for file in rvm rvmsudo rvm-shell rvm-auto-ruby ; do
 
-  [[ -s "$rvm_bin_path/$file" ]] && chmod +x "$rvm_bin_path/$file"
+  [[ -s "${rvm_bin_path:-"$rvm_path/bin"}/$file" ]] && chmod +x "${rvm_bin_path:-"$rvm_path/bin"}/$file"
 
 done
 

data/scripts/list

@@ -32,7 +32,7 @@ list_gemsets() {
 
   printf "\nrvm gemsets\n"
 
-  versions=($(builtin cd "$rvm_gems_path/" ; find . -maxdepth 1 -mindepth 1 -type d -print 2> /dev/null | awk '/[a-z]*-.*/ {print $NF}'))
+  versions=($(builtin cd "${rvm_gems_path:-"$rvm_path/gems"}/" ; find . -maxdepth 1 -mindepth 1 -type d -print 2> /dev/null | awk '/[a-z]*-.*/ {print $NF}'))
 
   for version in "${versions[@]//.\/}" ; do
 
@@ -41,13 +41,13 @@ list_gemsets() {
     [[ "$all_rubies" != *"$ruby_version_name"* ]] && continue
 
     if echo "$version" | grep -q '^jruby-' ; then
-      string="[ $("$rvm_rubies_path/$ruby_version_name/bin/ruby" -v | awk '{print $NF}' | sed -e 's/\[//' -e 's/\]//') ]"
+      string="[ $("$rvm_path/rubies/$ruby_version_name/bin/ruby" -v | awk '{print $NF}' | sed -e 's/\[//' -e 's/\]//') ]"
 
     elif [[ -n "$(echo "$version" | awk '/^maglev-|^macruby-/')" ]] ; then
       string="[ x86_64 ]"
 
     else
-      string="[ $(file "$rvm_rubies_path/$ruby_version_name/bin/ruby" | awk '/x86.64/ {print "x86_64"} /386/ {print "i386"} /ppc/ {print "ppc"}' | tr "\n" ' ')]"
+      string="[ $(file "$rvm_path/rubies/$ruby_version_name/bin/ruby" | awk '/x86.64/ {print "x86_64"} /386/ {print "i386"} /ppc/ {print "ppc"}' | tr "\n" ' ')]"
     fi
 
     printf "\n"
@@ -67,15 +67,15 @@ list_gemsets() {
 
   done
 
-  if [[ -f "$rvm_config_path/default" && -s "$rvm_config_path/default" ]] ; then
+  if [[ -f "$rvm_path/config/default" && -s "$rvm_path/config/default" ]] ; then
 
-    version=$(grep 'MY_RUBY_HOME' "$rvm_config_path/default" | head -n1 | awk -F"'" '{print $2}' | xargs basename --)
+    version=$(grep 'MY_RUBY_HOME' "$rvm_path/config/default" | head -n1 | awk -F"'" '{print $2}' | xargs basename --)
 
     if [[ -n "$version" ]] ; then
 
       printf "\nDefault Ruby (for new shells)\n"
 
-      string="[ $(file "$rvm_rubies_path/$version/bin/ruby" | awk '/x86.64/ {print "x86_64"} /386/ {print "i386"} /ppc/ {print "ppc"}' | tr "\n" ' ')]"
+      string="[ $(file "$rvm_path/rubies/$version/bin/ruby" | awk '/x86.64/ {print "x86_64"} /386/ {print "i386"} /ppc/ {print "ppc"}' | tr "\n" ' ')]"
 
       if [[ ${rvm_pretty_print_flag:-0} -eq 1 ]] ; then
 
@@ -102,7 +102,7 @@ list_default() {
     "$rvm_path/scripts/alias" show default 2>/dev/null | awk -F"${rvm_gemset_separator:-"@"}" '{print $1}' | xargs basename --
 
   else
-    if [[ -L "$rvm_rubies_path/default" ]]; then
+    if [[ -L "$rvm_path/rubies/default" ]]; then
 
       version=$("$rvm_path/scripts/alias" show default 2>/dev/null | awk -F"${rvm_gemset_separator:-"@"}" '{print $1}' | xargs basename --)
 
@@ -110,7 +110,7 @@ list_default() {
 
         printf "\nDefault Ruby (for new shells)\n"
 
-        string="[ $(file "$rvm_rubies_path/$version/bin/ruby" | awk '/x86.64/ {print "x86_64"} /386/ {print "i386"} /ppc/ {print "ppc"}' | \tr "\n" ' ')]"
+        string="[ $(file "$rvm_path/rubies/$version/bin/ruby" | awk '/x86.64/ {print "x86_64"} /386/ {print "i386"} /ppc/ {print "ppc"}' | \tr "\n" ' ')]"
 
         if [[ ${rvm_pretty_print_flag:-0} -eq 1 ]] ; then
 
@@ -148,7 +148,7 @@ list_ruby_svn_tags() {
 list_strings() {
 
   (
-  cd "$rvm_rubies_path"
+  cd "$rvm_path/rubies"
 
   find . -maxdepth 1 -mindepth 1 -type d | sed -e 's#./##g'
   )
@@ -163,7 +163,7 @@ list_gemset_strings() {
 
   all_rubies="$(list_strings)"
 
-  gemsets=($(builtin cd "$rvm_gems_path" ; find . -maxdepth 1 -mindepth 1 -type d 2>/dev/null | xargs -n1 basename -- | \grep -v '^\(@\|doc$\|cache$\|system$\)' | sort))
+  gemsets=($(builtin cd "${rvm_gems_path:-"$rvm_path/gems"}" ; find . -maxdepth 1 -mindepth 1 -type d 2>/dev/null | xargs -n1 basename -- | \grep -v '^\(@\|doc$\|cache$\|system$\)' | sort))
 
   for gemset in "${gemsets[@]//.\/}" ; do
 
@@ -180,7 +180,7 @@ list_gemset_strings() {
 # This is meant to be used with scripting.
 list_known_strings() {
 
-  sed -e 's/#.*$//g' -e 's#\[##g' -e 's#\]##g' < "$rvm_config_path/known" | sort -r | uniq
+  sed -e 's/#.*$//g' -e 's#\[##g' -e 's#\]##g' < "$rvm_path/config/known" | sort -r | uniq
 
   return $?
 }
@@ -196,11 +196,11 @@ list_known() {
 
   if [[ ${rvm_interactive_flag:-0} -eq 0 ]] ; then
 
-    cat "$rvm_config_path/known"
+    cat "$rvm_path/config/known"
 
   else
 
-    less "$rvm_config_path/known"
+    less "$rvm_path/config/known"
 
   fi
 
@@ -209,7 +209,7 @@ list_known() {
 
 list_rubies_strings() {
 
-  ( builtin cd "$rvm_rubies_path" ; find -maxdepth 0 -type d | tail -n+2 | xargs -n1 basename -- |  __rvm_strip )
+  ( builtin cd "$rvm_path/rubies" ; find -maxdepth 0 -type d | tail -n+2 | xargs -n1 basename -- |  __rvm_strip )
 
   return $?
 }
@@ -224,15 +224,15 @@ list_rubies() {
 
   printf "\nrvm rubies\n"
 
-  rubies=($(builtin cd "$rvm_rubies_path/" ; find . -maxdepth 1 -mindepth 1 -type d 2> /dev/null | awk '/[a-z]*-.*/ {print $NF}'))
+  rubies=($(builtin cd "$rvm_path/rubies/" ; find . -maxdepth 1 -mindepth 1 -type d 2> /dev/null | awk '/[a-z]*-.*/ {print $NF}'))
 
   for version in "${rubies[@]//.\/}" ; do
 
-    [[ ! -x "$rvm_rubies_path/$version/bin/ruby" ]] && continue
+    [[ ! -x "$rvm_path/rubies/$version/bin/ruby" ]] && continue
 
     if echo "$version" | grep -q '^jruby-' ; then
 
-      string="[ $("$rvm_rubies_path/$version/bin/ruby" -v | awk '{print $NF}' | sed -e 's/\[//' -e 's/\]//') ]"
+      string="[ $("$rvm_path/rubies/$version/bin/ruby" -v | awk '{print $NF}' | sed -e 's/\[//' -e 's/\]//') ]"
 
     elif [[ ! -z "$(echo "$version" | awk '/^maglev-|^macruby-/')" ]] ; then
 
@@ -240,7 +240,7 @@ list_rubies() {
 
     else
 
-      string="[ $(file "$rvm_rubies_path/$version/bin/ruby" | awk '/x86.64/ {print "x86_64"} /386/ {print "i386"} /ppc/ {print "ppc"}' | tr "\n" ' ')]"
+      string="[ $(file "$rvm_path/rubies/$version/bin/ruby" | awk '/x86.64/ {print "x86_64"} /386/ {print "i386"} /ppc/ {print "ppc"}' | tr "\n" ' ')]"
     fi
 
     printf "\n"
@@ -261,15 +261,15 @@ list_rubies() {
 
   done
 
-  if [[ -f "$rvm_config_path/default" ]] && [[ -s "$rvm_config_path/default" ]] ; then
+  if [[ -f "$rvm_path/config/default" ]] && [[ -s "$rvm_path/config/default" ]] ; then
 
-    version=$(grep 'MY_RUBY_HOME' "$rvm_config_path/default" | head -n 1 | awk -F"'" '{print $2}' | xargs basename --)
+    version=$(grep 'MY_RUBY_HOME' "$rvm_path/config/default" | head -n 1 | awk -F"'" '{print $2}' | xargs basename --)
 
     if [[ -n "$version" ]] ; then
 
       printf "Default Ruby (for new shells)\n"
 
-      string="[ $(file "$rvm_rubies_path/$version/bin/ruby" | awk '/x86.64/ {print "x86_64"} /386/ {print "i386"} /ppc/ {print "ppc"}' | \tr "\n" ' ')]"
+      string="[ $(file "$rvm_path/rubies/$version/bin/ruby" | awk '/x86.64/ {print "x86_64"} /386/ {print "i386"} /ppc/ {print "ppc"}' | \tr "\n" ' ')]"
 
       if [[ ${rvm_pretty_print_flag:-0} -eq 1 ]] ; then
         printf "  $(tput setaf 2)$version$(tput sgr0) $string\n"

data/scripts/log

@@ -16,7 +16,8 @@ if [[ ${rvm_pretty_print_flag:-0} -eq 0 ]] ; then
   fi
 
   case "$level" in
-    debug|info|warn) printf "$message\n" ;;
+    info)       printf "${message#*: }\n" ;;
+    debug|warn) printf "$message\n" ;;
     error|fail) printf "$message\n" >&2  ;;
     *) printf "$message"
   esac

data/scripts/manage

@@ -59,13 +59,18 @@ __rvm_current_patch_names() {
 
 __rvm_apply_patches() {
 
-  local patches patch_name result patch_level_separator patch_fuzziness patch_level source_directory full_patch_path
+  local result patches patch_name patch_level_separator patch_fuzziness patch_level source_directory full_patch_path
 
   result=0
   patch_level_separator="%"
   patch_fuzziness="25"
   patch_level=1
-  source_directory="${1:-"$rvm_ruby_src_path"}"
+
+  source_directory="${1:-""}"
+
+  if [[ -z "$source_directory" ]] ; then
+    source_directory="${rvm_src_path:-"$rvm_path/src"}/$rvm_ruby_string"
+  fi
 
   (
     builtin cd "$source_directory"
@@ -107,7 +112,7 @@ __rvm_apply_patches() {
 
 __rvm_install_source() {
 
-  local directory configure_parameters db_configure_flags
+  local result directory configure_parameters db_configure_flags
 
   [[ ${rvm_ruby_selected_flag:-0} -eq 0 ]] && __rvm_select
 
@@ -115,13 +120,14 @@ __rvm_install_source() {
     *-head) __rvm_ensure_has_18_compat_ruby || return 1 ;;
   esac
 
-  "$rvm_path/scripts/log" "info" "\nInstalling Ruby from source to: $rvm_ruby_home, this may take a while depending on your cpu(s)...\n"
+  "$rvm_path/scripts/log" "info" \
+    "Installing Ruby from source to: $rvm_ruby_home, this may take a while depending on your cpu(s)...\n"
 
-  builtin cd "$rvm_src_path"
+  builtin cd "${rvm_src_path:-"$rvm_path/src"}"
 
   if [[ ${rvm_force_flag:-0} -eq 1 ]] ; then
 
-    for directory in "$rvm_ruby_home" "$rvm_ruby_src_path" ; do
+    for directory in "$rvm_ruby_home" "${rvm_src_path:-"$rvm_path/src"}/$rvm_ruby_string" ; do
 
       if [[ -d "$directory" ]] ; then
         rm -rf "$directory"
@@ -141,7 +147,7 @@ __rvm_install_source() {
     return $result
   fi
 
-  builtin cd "$rvm_ruby_src_path"
+  builtin cd "${rvm_src_path:-"$rvm_path/src"}/$rvm_ruby_string"
 
   result=$? ; if [[ "$result" -gt 0 ]] ; then
     "$rvm_path/scripts/log" "error" \
@@ -164,7 +170,7 @@ __rvm_install_source() {
     return $result
   fi
 
-  if [[ -z "${rvm_ruby_configure:-""}" && ! -s "$rvm_ruby_src_path/configure" ]] ; then
+  if [[ -z "${rvm_ruby_configure:-""}" && ! -s "${rvm_src_path:-"$rvm_path/src"}/$rvm_ruby_string/configure" ]] ; then
 
     if command -v autoconf > /dev/null ; then
 
@@ -199,7 +205,7 @@ __rvm_install_source() {
     # to point to an expanded path.
     if [[ "${rvm_ruby_string:-""}" = "ruby-1.9.2-head" ]] ; then
 
-      local compatible_baseruby="$rvm_wrappers_path/$(__rvm_18_compat_ruby)/ruby"
+      local compatible_baseruby="$rvm_path/wrappers/$(__rvm_18_compat_ruby)/ruby"
 
       if [[ -x "$compatible_baseruby" ]] ; then
         configure_parameters="--with-baseruby=$compatible_baseruby"
@@ -325,9 +331,9 @@ __rvm_install_ruby() {
             return $result
           fi
 
-          mv "$rvm_archives_path/macruby_nightly-latest.pkg" "$rvm_archives_path/macruby_nightly.pkg"
+          mv "${rvm_archives_path:-"$rvm_path/archives"}/macruby_nightly-latest.pkg" "$rvm_archives_path/macruby_nightly.pkg"
 
-          __rvm_run "macruby/extract" "sudo /usr/sbin/installer -pkg '$rvm_archives_path/macruby_nightly.pkg' -target '/'"
+          __rvm_run "macruby/extract" "sudo /usr/sbin/installer -pkg '${rvm_archives_path:-"$rvm_path/archives"}/macruby_nightly.pkg' -target '/'"
 
           mkdir -p "$rvm_ruby_home/bin"
 
@@ -347,13 +353,13 @@ __rvm_install_ruby() {
             return $result
           fi
 
-          mkdir -p $rvm_ruby_src_path
+          mkdir -p ${rvm_src_path:-"$rvm_path/src"}/$rvm_ruby_string
 
-          unzip -o -j "$rvm_archives_path/$rvm_ruby_package_file" "MacRuby ${rvm_ruby_version}/MacRuby ${rvm_ruby_version}.pkg" -d "$rvm_ruby_src_path"
+          unzip -o -j "${rvm_archives_path:-"$rvm_path/archives"}/$rvm_ruby_package_file" "MacRuby ${rvm_ruby_version}/MacRuby ${rvm_ruby_version}.pkg" -d "${rvm_src_path:-"$rvm_path/src"}/$rvm_ruby_string"
 
-          mv "$rvm_ruby_src_path/MacRuby ${rvm_ruby_version}.pkg" "$rvm_ruby_src_path/$rvm_ruby_string.pkg"
+          mv "${rvm_src_path:-"$rvm_path/src"}/$rvm_ruby_string/MacRuby ${rvm_ruby_version}.pkg" "${rvm_src_path:-"$rvm_path/src"}/$rvm_ruby_string/$rvm_ruby_string.pkg"
 
-          __rvm_run "macruby/extract" "sudo /usr/sbin/installer -pkg '$rvm_ruby_src_path/$rvm_ruby_string.pkg' -target '/'"
+          __rvm_run "macruby/extract" "sudo /usr/sbin/installer -pkg '${rvm_src_path:-"$rvm_path/src"}/$rvm_ruby_string/$rvm_ruby_string.pkg' -target '/'"
 
           mkdir -p "$rvm_ruby_home/bin"
         fi
@@ -386,7 +392,7 @@ RubyWrapper
           fi
 
           if [[ "$binary_name" = "ruby" ]] ; then
-            echo "$ruby_wrapper" > "$rvm_bin_path/$rvm_ruby_string"
+            echo "$ruby_wrapper" > "${rvm_bin_path:-"$rvm_bin_path/bin"}/$rvm_ruby_string"
           fi
         done ; unset binaries
 
@@ -405,9 +411,9 @@ RubyWrapper
 
         "$rvm_path/scripts/log" "info" "Installing Ruby Enterprise Edition from source to: $rvm_ruby_home"
 
-        builtin cd "$rvm_src_path"
+        builtin cd "${rvm_src_path:-"$rvm_path/src"}"
 
-        if [[ ${rvm_force_flag:-0} -eq 0 && -d "$rvm_ruby_src_path" && ! -x "$rvm_ruby_src_path/installer" ]] ; then
+        if [[ ${rvm_force_flag:-0} -eq 0 && -d "${rvm_src_path:-"$rvm_path/src"}/$rvm_ruby_string" && ! -x "${rvm_src_path:-"$rvm_path/src"}/$rvm_ruby_string/installer" ]] ; then
 
           "$rvm_path/scripts/log" \
             "It appears that the archive has already been extracted. Skipping extract (use --force to force re-download and extract)."
@@ -426,9 +432,9 @@ RubyWrapper
             return $result
           fi
 
-          rm -rf "$rvm_ruby_src_path"
+          rm -rf "${rvm_src_path:-"$rvm_path/src"}/$rvm_ruby_string"
 
-          __rvm_run "extract" "gunzip < \"$rvm_archives_path/$rvm_ruby_package_file.$rvm_archive_extension\" | tar xf - -C $rvm_src_path" "$rvm_ruby_string - #extracting $rvm_ruby_package_file to $rvm_ruby_src_path"
+          __rvm_run "extract" "gunzip < \"${rvm_archives_path:-"$rvm_path/archives"}/$rvm_ruby_package_file.$rvm_archive_extension\" | tar xf - -C ${rvm_src_path:-"$rvm_path/src"}" "$rvm_ruby_string - #extracting $rvm_ruby_package_file to ${rvm_src_path:-"$rvm_path/src"}/$rvm_ruby_string"
           result=$?
 
           if [[ "$result" -gt 0 ]] ; then
@@ -437,10 +443,10 @@ RubyWrapper
             return $result
           fi
 
-          mv "$rvm_src_path/$rvm_ruby_package_file" "$rvm_ruby_src_path"
+          mv "${rvm_src_path:-"$rvm_path/src"}/$rvm_ruby_package_file" "${rvm_src_path:-"$rvm_path/src"}/$rvm_ruby_string"
         fi
 
-        builtin cd "$rvm_ruby_src_path"
+        builtin cd "${rvm_src_path:-"$rvm_path/src"}/$rvm_ruby_string"
 
         # wait, what? v v v TODO: Investigate line smell.
         mkdir -p "${rvm_ruby_home}/lib/ruby/gems/1.8/gems"
@@ -455,7 +461,7 @@ RubyWrapper
 
         __rvm_db "${rvm_ruby_interpreter}_configure_flags" "db_configure_flags"
 
-        __rvm_apply_patches "$rvm_ruby_src_path/source"
+        __rvm_apply_patches "${rvm_src_path:-"$rvm_path/src"}/$rvm_ruby_string/source"
         result=$?
 
         if [[ "$result" -gt 0 ]] ; then
@@ -464,7 +470,7 @@ RubyWrapper
           return $result
         fi
 
-        __rvm_run "install" "./installer -a $rvm_rubies_path/$rvm_ruby_string $rvm_ree_options $db_configure_flags $rvm_configure_flags" "$rvm_ruby_string - #installing "
+        __rvm_run "install" "./installer -a $rvm_path/rubies/$rvm_ruby_string $rvm_ree_options $db_configure_flags $rvm_configure_flags" "$rvm_ruby_string - #installing "
         result=$?
 
         if [[ "$result" -gt 0 ]] ; then
@@ -526,7 +532,7 @@ RubyWrapper
           return $result
         fi
         __rvm_run "extract" \
-          "gunzip < \"$rvm_archives_path/$(basename $rvm_ruby_package_file)\" | tar xf - -C $rvm_src_path" "Extracting $rvm_ruby_package_file ..."
+          "gunzip < \"${rvm_archives_path:-"$rvm_path/archives"}/$(basename $rvm_ruby_package_file)\" | tar xf - -C ${rvm_src_path:-"$rvm_path/src"}" "Extracting $rvm_ruby_package_file ..."
         result=$?
 
         if [[ "$result" -gt 0 ]] ; then
@@ -536,12 +542,12 @@ RubyWrapper
         fi
 
         # Remove the left over folder first.
-        rm -rf "$rvm_ruby_src_path"
+        rm -rf "${rvm_src_path:-"$rvm_path/src"}/$rvm_ruby_string"
 
-        mv "$rvm_src_path/rubinius-${rvm_ruby_version}" "$rvm_ruby_src_path"
+        mv "${rvm_src_path:-"$rvm_path/src"}/rubinius-${rvm_ruby_version}" "${rvm_src_path:-"$rvm_path/src"}/$rvm_ruby_string"
       else
         __rvm_db "rubinius_repo_url" "rvm_ruby_repo_url"
-        #rvm_ruby_home="$rvm_rubies_path/$rvm_ruby_interpreter-$rvm_ruby_version"
+        #rvm_ruby_home="$rvm_path/rubies/$rvm_ruby_interpreter-$rvm_ruby_version"
         __rvm_fetch_from_github "rbx"
         result=$?
 
@@ -552,7 +558,7 @@ RubyWrapper
         fi
       fi
 
-      builtin cd "$rvm_ruby_src_path"
+      builtin cd "${rvm_src_path:-"$rvm_path/src"}/$rvm_ruby_string"
 
       chmod +x ./configure
 
@@ -571,7 +577,7 @@ RubyWrapper
 
       rvm_configure_flags="${rvm_configure_flags:-"--skip-system"}"
 
-      rvm_ruby_configure="$rvm_bin_path/$ruby configure --prefix=$rvm_ruby_home $db_configure_flags $rvm_configure_flags" ; message="Configuring rbx"
+      rvm_ruby_configure="${rvm_bin_path:-"$rvm_path/bin"}/$ruby configure --prefix=$rvm_ruby_home $db_configure_flags $rvm_configure_flags" ; message="Configuring rbx"
 
       if [[ "$rvm_llvm_flag" = "0" ]] ; then
         rvm_ruby_configure="$rvm_ruby_configure --disable-llvm"
@@ -592,9 +598,9 @@ RubyWrapper
       fi
 
       if [[ "$rvm_trace_flag" -eq 1 ]] ; then
-        rvm_ruby_make="$rvm_wrappers_path/$ruby/rake install --trace" ; message="Compiling rbx (with --trace)"
+        rvm_ruby_make="$rvm_path/wrappers/$ruby/rake install --trace" ; message="Compiling rbx (with --trace)"
       else
-        rvm_ruby_make="$rvm_wrappers_path/$ruby/rake install" ; message="Compiling rbx"
+        rvm_ruby_make="$rvm_path/wrappers/$ruby/rake install" ; message="Compiling rbx"
       fi
 
       __rvm_run "rake" "$rvm_ruby_make" "$message"
@@ -648,7 +654,7 @@ RubyWrapper
         printf "java must be installed and in your path in order to install JRuby." ; return 1
       fi
 
-      builtin cd "$rvm_src_path"
+      builtin cd "${rvm_src_path:-"$rvm_path/src"}"
 
       __rvm_fetch_ruby
       result=$?
@@ -659,7 +665,7 @@ RubyWrapper
         return $result
       fi
 
-      builtin cd "$rvm_ruby_src_path"
+      builtin cd "${rvm_src_path:-"$rvm_path/src"}/$rvm_ruby_string"
 
       if [[ ${rvm_head_flag:-0} -eq 1 ]] ; then
         __rvm_run "ant.dist" "ant dist" "$rvm_ruby_string - #ant dist"
@@ -670,11 +676,11 @@ RubyWrapper
       case "$rvm_ruby_version" in
         1.3|1.2)
           __rvm_run "nailgun" \
-            "builtin cd \"$rvm_ruby_src_path/tool/nailgun\" &&  make $rvm_make_flags" "Building Nailgun"
+            "builtin cd \"${rvm_src_path:-"$rvm_path/src"}/$rvm_ruby_string/tool/nailgun\" &&  make $rvm_make_flags" "Building Nailgun"
           ;;
         *)
           __rvm_run "nailgun" \
-            "builtin cd \"$rvm_ruby_src_path/tool/nailgun\" && ./configure --prefix=$rvm_ruby_home && make $rvm_make_flags" "Building Nailgun"
+            "builtin cd \"${rvm_src_path:-"$rvm_path/src"}/$rvm_ruby_string/tool/nailgun\" && ./configure --prefix=$rvm_ruby_home && make $rvm_make_flags" "Building Nailgun"
           ;;
       esac
 
@@ -684,7 +690,7 @@ RubyWrapper
 
       rm -rf "$rvm_ruby_home"
 
-      __rvm_run "install" "/bin/cp -Rf $rvm_ruby_src_path $rvm_ruby_home" "$rvm_ruby_string - #installing to $rvm_ruby_home"
+      __rvm_run "install" "/bin/cp -Rf ${rvm_src_path:-"$rvm_path/src"}/$rvm_ruby_string $rvm_ruby_home" "$rvm_ruby_string - #installing to $rvm_ruby_home"
 
       (
         builtin cd "$rvm_ruby_home/bin/"
@@ -739,11 +745,11 @@ RubyWrapper
         return $result
       fi
 
-      builtin cd "$rvm_src_path"
+      builtin cd "${rvm_src_path:-"$rvm_path/src"}"
 
-      if [[ ! -d "$rvm_src_path/$rvm_ruby_string" || ${rvm_force_flag:-0} -eq 1 ]] ; then
+      if [[ ! -d "${rvm_src_path:-"$rvm_path/src"}/$rvm_ruby_string" || ${rvm_force_flag:-0} -eq 1 ]] ; then
 
-        rm -rf "$rvm_src_path/$rvm_ruby_string/" "$rvm_src_path/$rvm_ruby_string/"
+        rm -rf "${rvm_src_path:-"$rvm_path/src"}/$rvm_ruby_string/" "${rvm_src_path:-"$rvm_path/src"}/$rvm_ruby_string/"
 
         __rvm_fetch_ruby
         result=$?
@@ -757,7 +763,7 @@ RubyWrapper
 
       if [[ ${rvm_head_flag:-0} -eq 1 ]] ; then
 
-        builtin cd "$rvm_ruby_src_path"
+        builtin cd "${rvm_src_path:-"$rvm_path/src"}/$rvm_ruby_string"
 
         rvm_gemstone_package_file="GemStone-$(\grep ^GEMSTONE version.txt | cut -f2 -d-).$(uname -sm | \tr ' ' '-')"
 
@@ -775,15 +781,15 @@ RubyWrapper
         return $result
       fi
 
-      builtin cd "$rvm_src_path"
+      builtin cd "${rvm_src_path:-"$rvm_path/src"}"
 
       if [[ -s "$rvm_ruby_package_file" ]] ; then
-        mv "$rvm_ruby_package_file" "$rvm_ruby_src_path"
+        mv "$rvm_ruby_package_file" "${rvm_src_path:-"$rvm_path/src"}/$rvm_ruby_string"
       fi
 
-      builtin cd "$rvm_ruby_src_path"
+      builtin cd "${rvm_src_path:-"$rvm_path/src"}/$rvm_ruby_string"
 
-      __rvm_run "gemstone.extract" "gunzip < \"$rvm_archives_path/${rvm_gemstone_package_file}.${rvm_archive_extension}\" | tar xf - -C $rvm_ruby_src_path"
+      __rvm_run "gemstone.extract" "gunzip < \"${rvm_archives_path:-"$rvm_path/archives"}/${rvm_gemstone_package_file}.${rvm_archive_extension}\" | tar xf - -C ${rvm_src_path:-"$rvm_path/src"}/$rvm_ruby_string"
       result=$?
 
       if [[ "$result" -gt 0 ]] ; then
@@ -802,7 +808,7 @@ RubyWrapper
         rm -rf $rvm_ruby_home
       fi
 
-      __rvm_run "install" "/bin/cp -Rf $rvm_ruby_src_path $rvm_ruby_home" "Installing maglev to $rvm_ruby_home"
+      __rvm_run "install" "/bin/cp -Rf ${rvm_src_path:-"$rvm_path/src"}/$rvm_ruby_string $rvm_ruby_home" "Installing maglev to $rvm_ruby_home"
 
       (
         builtin cd "$rvm_ruby_home/bin/"
@@ -839,14 +845,14 @@ RubyWrapper
 
       if [[ ! -e ${rvm_ruby_home}/etc/conf.d/maglev.conf ]] ; then
         "$rvm_path/scripts/log" "info" "Creating default 'maglev' repository."
-        "$rvm_wrappers_path/$compatible_ruby/rake" "stone:create[maglev]" >/dev/null 2>&1
+        "$rvm_path/wrappers/$compatible_ruby/rake" "stone:create[maglev]" >/dev/null 2>&1
       fi
 
       "$rvm_path/scripts/log" "info" "Generating maglev HTML documentation"
-      "$rvm_wrappers_path/$compatible_ruby/rake" rdoc >/dev/null 2>&1
+      "$rvm_path/wrappers/$compatible_ruby/rake" rdoc >/dev/null 2>&1
 
       "$rvm_path/scripts/log" "info" "Generating smalltalk FFI."
-      "$rvm_wrappers_path/$compatible_ruby/rake" stwrappers >/dev/null 2>&1
+      "$rvm_path/wrappers/$compatible_ruby/rake" stwrappers >/dev/null 2>&1
 
       unset compatible_ruby
 
@@ -890,14 +896,14 @@ RubyWrapper
 
         if [[ $? -gt 0 ]] ; then result=$? ; return $result ; fi
 
-        builtin cd "$rvm_ruby_src_path"
+        builtin cd "${rvm_src_path:-"$rvm_path/src"}/$rvm_ruby_string"
 
         compatible_ruby="$(__rvm_18_compat_ruby)"
 
-        "$rvm_wrappers_path/$compatible_ruby/gem" install pathname2 --no-rdoc --no-ri
+        "$rvm_path/wrappers/$compatible_ruby/gem" install pathname2 --no-rdoc --no-ri
 
         # MONO_LIB=/Library/Frameworks/Mono.framework/Versions/current/lib/
-        rvm_ruby_make="$rvm_wrappers_path/$compatible_ruby/rake MERLIN_ROOT=\"$rvm_ruby_src_path/Merlin/Main\" compile mono=1 configuration=release --trace"
+        rvm_ruby_make="$rvm_path/wrappers/$compatible_ruby/rake MERLIN_ROOT=\"${rvm_src_path:-"$rvm_path/src"}/$rvm_ruby_string/Merlin/Main\" compile mono=1 configuration=release --trace"
         __rvm_run "rake" "$rvm_ruby_make" "Building IronRuby..."
         unset compatible_ruby
         if [[ $? -gt 0 ]] ; then result=$? ; return $result ; fi
@@ -905,26 +911,42 @@ RubyWrapper
         rm -rf "$rvm_ruby_home"/*
         mkdir -p "$rvm_ruby_home/bin" "$rvm_ruby_home/lib" "$rvm_ruby_home/lib/ruby" "$rvm_ruby_home/lib/IronRuby"
 
-        cp -r "$rvm_ruby_src_path/Merlin/Main/Bin/mono_release"/* "$rvm_ruby_home/bin/"
-        cp -r "$rvm_ruby_src_path/Merlin/Main/Languages/Ruby/Scripts/bin"/* "$rvm_ruby_home/bin/"
-        cp -r "$rvm_ruby_src_path/Merlin/External.LCA_RESTRICTED/Languages/Ruby/redist-libs/ruby"/* "$rvm_ruby_home/lib/ruby"
-        cp -r "$rvm_ruby_src_path/Merlin/Main/Languages/Ruby/Libs"/* "$rvm_ruby_home/lib/IronRuby"
+        cp -r "${rvm_src_path:-"$rvm_path/src"}/$rvm_ruby_string/Merlin/Main/Bin/mono_release"/* "$rvm_ruby_home/bin/"
+        cp -r "${rvm_src_path:-"$rvm_path/src"}/$rvm_ruby_string/Merlin/Main/Languages/Ruby/Scripts/bin"/* "$rvm_ruby_home/bin/"
+        cp -r "${rvm_src_path:-"$rvm_path/src"}/$rvm_ruby_string/Merlin/External.LCA_RESTRICTED/Languages/Ruby/redist-libs/ruby"/* "$rvm_ruby_home/lib/ruby"
+        cp -r "${rvm_src_path:-"$rvm_path/src"}/$rvm_ruby_string/Merlin/Main/Languages/Ruby/Libs"/* "$rvm_ruby_home/lib/IronRuby"
       else
-        "$rvm_path/scripts/log" "info" "Retrieving IronRuby"
+        "$rvm_path/scripts/log" "info" \
+          "Retrieving IronRuby"
 
-        "$rvm_path/scripts/fetch" "$rvm_ruby_url" "$rvm_ruby_package_file"
-        result=$? ; if [[ "$result" -gt 0 ]] ; then
-          "$rvm_path/scripts/log" "error" "There has been an error while trying to fetch the source. Halting the installation." ; return $result
+        "$rvm_path/scripts/fetch" "$rvm_ruby_url" \
+          "$rvm_ruby_package_file"
+        result=$?
+
+        if [[ "$result" -gt 0 ]] ; then
+          "$rvm_path/scripts/log" "error" \
+            "There has been an error while trying to fetch the source. Halting the installation."
+          return $result
         fi
 
-        mkdir -p "$rvm_ruby_src_path" "$rvm_ruby_home"
-        unzip -o  -d "${rvm_ruby_src_path}" "${rvm_archives_path}/${rvm_ruby_package_file}" >> "$rvm_ruby_log_path/extract.log" 2>> "$rvm_ruby_log_path/extract.error.log"
-        result=$? ; if [[ "$result" -gt 1 ]] ; then
-          "$rvm_path/scripts/log" "error" "There has been an error while trying to extract $rvm_ruby_package_file. Halting the installation." ; return $result
+        mkdir -p "${rvm_src_path:-"$rvm_path/src"}/$rvm_ruby_string" "$rvm_ruby_home"
+
+        unzip -o  -d "${rvm_src_path:-"$rvm_path/src"}/$rvm_ruby_string" \
+          "${rvm_archives_path:-"$rvm_path/archives"}/${rvm_ruby_package_file}" >> \
+          "${rvm_log_path:-"$rvm_path/log"}$rvm_ruby_string/extract.log" 2>> \
+          "${rvm_log_path:-"$rvm_path/log"}$rvm_ruby_string/extract.error.log"
+        result=$?
+
+        if [[ "$result" -gt 1 ]] ; then
+
+          "$rvm_path/scripts/log" "error" \
+            "There has been an error while trying to extract $rvm_ruby_package_file. Halting the installation."
+          return $result
+
         fi
 
         for dir in bin lib silverlight ; do
-          cp -Rf "$rvm_src_path/$rvm_ruby_string/$dir" "$rvm_ruby_home/$dir"
+          cp -Rf "${rvm_src_path:-"$rvm_path/src"}/$rvm_ruby_string/$dir" "$rvm_ruby_home/$dir"
         done
       fi
 
@@ -954,7 +976,9 @@ RubyWrapper
 
       builtin hash -r
 
-      __rvm_run "gems.install" "PATH=$rvm_ruby_gem_home/bin:$rvm_ruby_global_gems_path/bin:$rvm_ruby_home/bin:$PATH GEM_HOME=$rvm_ruby_gem_home GEM_PATH=$rvm_ruby_gem_home $rvm_ruby_home/bin/gem install --no-rdoc --no-ri rake $rvm_gem_options" "Installing $rvm_gem_name to $dir"
+      __rvm_run "gems.install" \
+        "PATH=\"$rvm_ruby_gem_home/bin:$rvm_ruby_global_gems_path/bin:$rvm_ruby_home/bin:$PATH\" GEM_HOME=\"$rvm_ruby_gem_home\" GEM_PATH=\"$rvm_ruby_gem_home:$rvm_ruby_global_gems_path\" $rvm_ruby_home/bin/gem install --no-rdoc --no-ri rake $rvm_gem_options" \
+        "Installing $rvm_gem_name to $dir"
     ;;
 
     mput|shyouhei)
@@ -969,12 +993,11 @@ RubyWrapper
 
       builtin hash -r
 
-      rvm_ruby_home="$rvm_rubies_path/$rvm_ruby_interpreter-$rvm_ruby_version"
+      rvm_ruby_home="$rvm_path/rubies/$rvm_ruby_interpreter-$rvm_ruby_version"
 
       __rvm_fetch_from_github "mput" "trunk"
 
-      __rvm_apply_patches
-      result=$?
+      __rvm_apply_patches ; result=$?
 
       if [[ "$result" -gt 0 ]] ; then
         "$rvm_path/scripts/log" "error" \
@@ -982,7 +1005,7 @@ RubyWrapper
         return $result
       fi
 
-      if [[ ! -s "$rvm_ruby_src_path/configure" ]] ; then
+      if [[ ! -s "${rvm_src_path:-"$rvm_path/src"}/$rvm_ruby_string/configure" ]] ; then
 
         if command -v autoconf &> /dev/null ; then
 
@@ -998,7 +1021,8 @@ RubyWrapper
       if [[ -s ./Makefile ]] && [[ -z "$rvm_reconfigure_flag" ]] ; then
 
         if [[ ${rvm_debug_flag:-0} -gt 0 ]] ; then
-          "$rvm_path/scripts/log" "debug" "Skipping configure step, Makefile exists so configure must have already been run."
+          "$rvm_path/scripts/log" "debug" \
+            "Skipping configure step, Makefile exists so configure must have already been run."
         fi
 
       elif [[ -n "$rvm_ruby_configure" ]] ; then
@@ -1015,7 +1039,8 @@ RubyWrapper
       elif [[ -s ./configure ]] ; then
         local configure_command="./configure --prefix=$rvm_ruby_home $rvm_configure_flags"
 
-        __rvm_run "configure" "" "Configuring $rvm_ruby_string using $rvm_configure_flags, this may take a while depending on your cpu(s)..."
+        __rvm_run "configure" "" \
+          "Configuring $rvm_ruby_string using $rvm_configure_flags, this may take a while depending on your cpu(s)..."
         result=$?
 
         if [[ "$result" -gt 0 ]] ; then
@@ -1031,7 +1056,8 @@ RubyWrapper
 
       rvm_ruby_make=${rvm_ruby_make:-"make"}
 
-      __rvm_run "make" "$rvm_ruby_make $rvm_make_flags" "Compiling $rvm_ruby_string, this may take a while depending on your cpu(s)..."
+      __rvm_run "make" "$rvm_ruby_make $rvm_make_flags" \
+        "Compiling $rvm_ruby_string, this may take a while depending on your cpu(s)..."
       result=$?
 
       if [[ "$result" -gt 0 ]] ; then
@@ -1051,7 +1077,8 @@ RubyWrapper
         return $result
       fi
 
-      "$rvm_path/scripts/log" "info" "Installation of $rvm_ruby_string is complete."
+      "$rvm_path/scripts/log" "info" \
+        "Installation of $rvm_ruby_string is complete."
 
       export GEM_HOME="$rvm_ruby_gem_home"
       export GEM_PATH="$rvm_ruby_gem_path"
@@ -1098,15 +1125,17 @@ RubyWrapper
 }
 
 __rvm_fetch_from_github() {
-  rm -rf "$rvm_ruby_src_path"
+  local result
+
+  rm -rf "${rvm_src_path:-"$rvm_path/src"}/$rvm_ruby_string"
 
-  if [[ ! -d "$rvm_ruby_repo_path/.git" ]] ; then
+  if [[ ! -d "${rvm_repos_path:-"$rvm_path/repos"}/$rvm_ruby_string/.git" ]] ; then
 
-    rm -rf "$rvm_ruby_repo_path"
+    rm -rf "${rvm_repos_path:-"$rvm_path/repos"}/$rvm_ruby_string"
 
     builtin cd "$rvm_home"
 
-    __rvm_run "$1.repo" "git clone --depth 1 $rvm_ruby_repo_url $rvm_ruby_repo_path" "Cloning $rvm_ruby_repo_url"
+    __rvm_run "$1.repo" "git clone --depth 1 $rvm_ruby_repo_url ${rvm_repos_path:-"$rvm_path/repos"}/$rvm_ruby_string" "Cloning $rvm_ruby_repo_url"
     result=$?
 
     if [[ "$result" -gt 0 ]] ; then
@@ -1114,22 +1143,26 @@ __rvm_fetch_from_github() {
 
       "$rvm_path/scripts/log" "info" "Could not fetch $rvm_ruby_repo_url - trying $rvm_ruby_repo_http_url"
 
-      __rvm_run "$1.repo" "git clone --depth 1 $rvm_ruby_repo_http_url $rvm_ruby_repo_path" "Cloning $rvm_ruby_repo_http_url"
+      __rvm_run "$1.repo" "git clone --depth 1 $rvm_ruby_repo_http_url ${rvm_repos_path:-"$rvm_path/repos"}/$rvm_ruby_string" "Cloning $rvm_ruby_repo_http_url"
     fi
   else
     local branch="${2:-"master"}"
 
-    builtin cd "$rvm_ruby_repo_path"
+    builtin cd "${rvm_repos_path:-"$rvm_path/repos"}/$rvm_ruby_string"
 
     __rvm_run "$1.repo" "git pull origin $branch" "Pulling from origin $branch"
   fi
 
-  __rvm_run "$1.copy" "\\cp -R \"$rvm_ruby_repo_path\" \"$rvm_ruby_src_path\"" "Copying from repo to source..."
+  __rvm_run "$1.copy" "\\cp -R \"${rvm_repos_path:-"$rvm_path/repos"}/$rvm_ruby_string\" \"${rvm_src_path:-"$rvm_path/src"}/$rvm_ruby_string\"" "Copying from repo to source..."
 
-  builtin cd "$rvm_ruby_src_path"
+  builtin cd "${rvm_src_path:-"$rvm_path/src"}/$rvm_ruby_string"
+
+  return $?
 }
 
 __rvm_fetch_ruby() {
+  local result
+
   [[ ${rvm_ruby_selected_flag:-0} -eq 0 ]] && __rvm_select
 
   "$rvm_path/scripts/log" "info" "$rvm_ruby_string - #fetching "
@@ -1146,7 +1179,7 @@ __rvm_fetch_ruby() {
       rvm_archive_extension="${rvm_archive_extension:-tar.gz}"
     fi
 
-    if [[ ! -s "$rvm_archives_path/$rvm_ruby_package_file.$rvm_archive_extension" ]] ; then
+    if [[ ! -s "${rvm_archives_path:-"$rvm_path/archives"}/$rvm_ruby_package_file.$rvm_archive_extension" ]] ; then
 
       case "$rvm_ruby_interpreter" in
         ruby)
@@ -1179,17 +1212,17 @@ __rvm_fetch_ruby() {
       fi
     fi
 
-    if [[ ! -d "$rvm_ruby_src_path" || ${rvm_force_flag:-0} -eq 1 ]] ; then
+    if [[ ! -d "${rvm_src_path:-"$rvm_path/src"}/$rvm_ruby_string" || ${rvm_force_flag:-0} -eq 1 ]] ; then
 
-      if [[ -d "$rvm_ruby_src_path" ]] ; then
-        rm -rf "$rvm_ruby_src_path" # Especially when forced, we want to ensure the destination is missing.
+      if [[ -d "${rvm_src_path:-"$rvm_path/src"}/$rvm_ruby_string" ]] ; then
+        rm -rf "${rvm_src_path:-"$rvm_path/src"}/$rvm_ruby_string" # Especially when forced, we want to ensure the destination is missing.
       fi
 
       mkdir -p "/tmp/rvm_src_$$"
 
       case "$rvm_archive_extension" in
         tar.gz|tgz)
-          __rvm_run "extract" "gunzip < \"$rvm_archives_path/$rvm_ruby_package_file.$rvm_archive_extension\" | tar xf - -C /tmp/rvm_src_$$" "$rvm_ruby_string - #extracting $rvm_ruby_package_file to $rvm_ruby_src_path"
+          __rvm_run "extract" "gunzip < \"${rvm_archives_path:-"$rvm_path/archives"}/$rvm_ruby_package_file.$rvm_archive_extension\" | tar xf - -C /tmp/rvm_src_$$" "$rvm_ruby_string - #extracting $rvm_ruby_package_file to ${rvm_src_path:-"$rvm_path/src"}/$rvm_ruby_string"
           result=$?
 
           if [[ "$result" -gt 0 ]] ; then
@@ -1199,7 +1232,7 @@ __rvm_fetch_ruby() {
           fi
           ;;
         zip)
-          __rvm_run "extract" "unzip -q -o $rvm_archives_path/$rvm_ruby_package_file -d /tmp/rvm_src_$$"
+          __rvm_run "extract" "unzip -q -o ${rvm_archives_path:-"$rvm_path/archives"}/$rvm_ruby_package_file -d /tmp/rvm_src_$$"
           result=$?
 
           if [[ "$result" -gt 0 ]] ; then
@@ -1209,7 +1242,7 @@ __rvm_fetch_ruby() {
           fi
           ;;
         tar.bz2)
-          __rvm_run "extract" "bunzip2 < \"$rvm_archives_path/$rvm_ruby_package_file.$rvm_archive_extension\" | tar xf - -C /tmp/rvm_src_$$" "$rvm_ruby_string - #extracting $rvm_ruby_package_file to $rvm_ruby_src_path"
+          __rvm_run "extract" "bunzip2 < \"${rvm_archives_path:-"$rvm_path/archives"}/$rvm_ruby_package_file.$rvm_archive_extension\" | tar xf - -C /tmp/rvm_src_$$" "$rvm_ruby_string - #extracting $rvm_ruby_package_file to ${rvm_src_path:-"$rvm_path/src"}/$rvm_ruby_string"
           result=$?
 
           if [[ "$result" -gt 0 ]] ; then
@@ -1225,29 +1258,30 @@ __rvm_fetch_ruby() {
           ;;
       esac
 
-      mv "/tmp/rvm_src_$$/$(builtin cd /tmp/rvm_src_$$ ; ls)" "$rvm_ruby_src_path" ; rm -rf "/tmp/rvm_src_$$"
+      mv "/tmp/rvm_src_$$/$(builtin cd /tmp/rvm_src_$$ ; ls)" "${rvm_src_path:-"$rvm_path/src"}/$rvm_ruby_string" ; rm -rf "/tmp/rvm_src_$$"
 
-      if [[ -n "${rvm_ruby_name:-""}" && -d "$rvm_src_path/$(echo $rvm_ruby_string | sed -e 's/-n.*//')" ]] ; then
-        mv "$rvm_src_path/$(echo "$rvm_ruby_string" | sed -e 's/-n.*//')" "$rvm_ruby_src_path"
+      if [[ -n "${rvm_ruby_name:-""}" && -d "${rvm_src_path:-"$rvm_path/src"}/$(echo $rvm_ruby_string | sed -e 's/-n.*//')" ]] ; then
+        mv "${rvm_src_path:-"$rvm_path/src"}/$(echo "$rvm_ruby_string" | sed -e 's/-n.*//')" "${rvm_src_path:-"$rvm_path/src"}/$rvm_ruby_string"
       fi
 
-      "$rvm_ruby_string - #extracted to $rvm_ruby_src_path"
+      "$rvm_path/scripts/log" "info" \
+        "$rvm_ruby_string - #extracted to ${rvm_src_path:-"$rvm_path/src"}/$rvm_ruby_string"
 
     else
       "$rvm_path/scripts/log" "info" \
-        "$rvm_ruby_string - #extracted to $rvm_ruby_src_path (already extracted)"
+        "$rvm_ruby_string - #extracted to ${rvm_src_path:-"$rvm_path/src"}/$rvm_ruby_string (already extracted)"
     fi
 
     return 0
   else
 
-    mkdir -p "$rvm_repo_path"
+    mkdir -p "${rvm_repo_path:-"$rvm_path/repos"}"
 
     if [[ -n "$(echo "$rvm_ruby_url" | awk '/^git/')" ]] ; then
 
-      if [[ -d "$rvm_ruby_repo_path/.git" ]] ; then
+      if [[ -d "${rvm_repos_path:-"$rvm_path/repos"}/$rvm_ruby_string/.git" ]] ; then
 
-        builtin cd "$rvm_ruby_repo_path"
+        builtin cd "${rvm_repos_path:-"$rvm_path/repos"}/$rvm_ruby_string"
 
         if [[ -z "$rvm_ruby_revision" ]] ; then
 
@@ -1280,20 +1314,20 @@ __rvm_fetch_ruby() {
         fi
 
       else
-        rm -rf "$rvm_ruby_repo_path"
+        rm -rf "${rvm_repos_path:-"$rvm_path/repos"}/$rvm_ruby_string"
 
         rvm_ruby_repo_http_url="${rvm_ruby_repo_url//git:/http:/}"
 
         "$rvm_path/scripts/log" "info" "Cloning from $rvm_ruby_repo_url, this may take a while depending on your connection..."
 
-        git clone --depth 1 "$rvm_ruby_repo_url" "$rvm_ruby_repo_path"
+        git clone --depth 1 "$rvm_ruby_repo_url" "${rvm_repos_path:-"$rvm_path/repos"}/$rvm_ruby_string"
         result=$?
 
         if [[ "$result" -gt 0 ]] ; then
           "$rvm_path/scripts/log" "info" \
             "cloning from $rvm_ruby_repo_url failed, now attempting to clone from $rvm_ruby_repo_http_url, this may take a while depending on your connection..."
 
-          git clone "$rvm_ruby_repo_http_url" "$rvm_ruby_repo_path"
+          git clone "$rvm_ruby_repo_http_url" "${rvm_repos_path:-"$rvm_path/repos"}/$rvm_ruby_string"
           result=$?
 
           if [[ "$result" -gt 0 ]] ; then
@@ -1334,9 +1368,9 @@ __rvm_fetch_ruby() {
         rvm_rev="-$rvm_ruby_revision"
       fi
 
-      if [[ -d "$rvm_ruby_repo_path/.svn" ]] ; then
+      if [[ -d "${rvm_repos_path:-"$rvm_path/repos"}/$rvm_ruby_string/.svn" ]] ; then
 
-        builtin cd "$rvm_ruby_repo_path"
+        builtin cd "${rvm_repos_path:-"$rvm_path/repos"}/$rvm_ruby_string"
 
         "$rvm_path/scripts/log" "info" "Updating ruby from $rvm_ruby_url"
 
@@ -1350,9 +1384,9 @@ __rvm_fetch_ruby() {
           __rvm_run "svn.checkout" "svn update -q ${rvm_rev/-r/-r }"
         fi
       else
-        rm -rf "$rvm_ruby_repo_path"
+        rm -rf "${rvm_repos_path:-"$rvm_path/repos"}/$rvm_ruby_string"
 
-        __rvm_run "svn.checkout" "svn checkout -q ${rvm_rev/-r/-r } $rvm_ruby_url $rvm_ruby_repo_path" "Downloading source from ${rvm_ruby_url}."
+        __rvm_run "svn.checkout" "svn checkout -q ${rvm_rev/-r/-r } $rvm_ruby_url ${rvm_repos_path:-"$rvm_path/repos"}/$rvm_ruby_string" "Downloading source from ${rvm_ruby_url}."
       fi
       result=$?
 
@@ -1365,9 +1399,9 @@ __rvm_fetch_ruby() {
 
     "$rvm_path/scripts/log" "info" "Copying from repo to src path..."
 
-    rm -rf "$rvm_ruby_src_path"
+    rm -rf "${rvm_src_path:-"$rvm_path/src"}/$rvm_ruby_string"
 
-    cp -R "$rvm_ruby_repo_path" "$rvm_ruby_src_path"
+    cp -R "${rvm_repos_path:-"$rvm_path/repos"}/$rvm_ruby_string" "${rvm_src_path:-"$rvm_path/src"}/$rvm_ruby_string"
   fi
 }
 
@@ -1388,7 +1422,7 @@ __rvm_uninstall_ruby() {
 
   if [[ -n "${rvm_ruby_string:-""}" ]] ; then
 
-    for dir in "$rvm_rubies_path" ; do
+    for dir in "$rvm_path/rubies" ; do
       if [[ -d "$dir/$rvm_ruby_string" ]] ; then
         "$rvm_path/scripts/log" "info" "Removing $dir/$rvm_ruby_string..."
 
@@ -1398,8 +1432,8 @@ __rvm_uninstall_ruby() {
           "$dir/$rvm_ruby_string has already been removed."
       fi
 
-      if [[ -e "$rvm_bin_path/$rvm_ruby_string" ]] ; then
-        rm -f "$rvm_bin_path/$rvm_ruby_string"
+      if [[ -e "${rvm_bin_path:-"$rvm_path/bin"}/$rvm_ruby_string" ]] ; then
+        rm -f "${rvm_bin_path:-"$rvm_path/bin"}/$rvm_ruby_string"
       fi
     done ; unset dir
 
@@ -1424,7 +1458,7 @@ __rvm_remove_ruby() {
 
   if [[ -n "${rvm_ruby_string:-""}" ]] ; then
 
-    for dir in $rvm_src_path $rvm_rubies_path ; do
+    for dir in ${rvm_src_path:-"$rvm_path/src"} $rvm_path/rubies ; do
 
       if [[ -d $dir/$rvm_ruby_string ]] ; then
         "$rvm_path/scripts/log" "info" "Removing $dir/$rvm_ruby_string..."
@@ -1434,8 +1468,8 @@ __rvm_remove_ruby() {
         "$rvm_path/scripts/log" "info" "it seems that $dir/$rvm_ruby_string is already non existent."
       fi
 
-      if [[ -e "$rvm_bin_path/$rvm_ruby_string" ]] ; then
-        rm -f "$rvm_bin_path/$rvm_ruby_string"
+      if [[ -e "${rvm_bin_path:-"$rvm_path/bin"}/$rvm_ruby_string" ]] ; then
+        rm -f "${rvm_bin_path:-"$rvm_path/bin"}/$rvm_ruby_string"
       fi
 
       __rvm_check_default
@@ -1458,7 +1492,7 @@ __rvm_remove_gemsets() {
   if [[ ${rvm_gems_flag:-0} -eq 1 ]] ; then
     "$rvm_path/scripts/log" "info" "Removing $rvm_ruby_string gemsets..."
 
-    gemsets=($(builtin cd "${rvm_gems_path}"/ ; find . -maxdepth 1 -mindepth 1 -type d))
+    gemsets=($(builtin cd "${rvm_gems_path:-"$rvm_path/gems"}"/ ; find . -maxdepth 1 -mindepth 1 -type d))
 
     for gemset in "${gemsets[@]//.\/}" ; do
       if [[ -d "$gemset" ]] ; then
@@ -1487,7 +1521,7 @@ __rvm_remove_environments() {
 
   local environments environment
 
-  environments=($(find "$rvm_environments_path" -maxdepth 1 -mindepth 1 -type f -iname "*$rvm_ruby_string*" ))
+  environments=($(find "$rvm_path/environments" -maxdepth 1 -mindepth 1 -type f -iname "*$rvm_ruby_string*" ))
 
   for environment in "${environments[@]}" ; do
     if [[ -d "$environment" ]] ; then
@@ -1503,7 +1537,7 @@ __rvm_remove_aliases() {
 
   local alias_name aliases
 
-  aliases=($(awk '/'$rvm_ruby_string'/' $rvm_config_path/alias | sed 's/=.*//'))
+  aliases=($(awk '/'$rvm_ruby_string'/' "$rvm_path/config/alias" | sed 's/=.*//'))
 
   for alias_name in "${aliases[@]}" ; do
     # Remove from alias key-value store
@@ -1516,7 +1550,7 @@ __rvm_remove_archives() {
 
     "$rvm_path/scripts/log" "info" "Removing $rvm_ruby_string archives..."
 
-    rm -f "$rvm_archives_path/${rvm_ruby_package_file}.${rvm_archive_extension}"
+    rm -f "${rvm_archives_path:-"$rvm_path/archives"}/${rvm_ruby_package_file}.${rvm_archive_extension}"
   fi
 }
 
@@ -1526,11 +1560,11 @@ __rvm_remove_binaries() {
   # Iterate over all binaries and check for symlinked wrappers etc.
   local binary_name binaries full_patch_path
 
-  binaries=($(find "$rvm_bin_path" -maxdepth 1 -mindepth 1 -type f -iname "*$rvm_ruby_string*" ))
+  binaries=($(find "${rvm_bin_path:-"$rvm_path/bin"}" -maxdepth 1 -mindepth 1 -type f -iname "*$rvm_ruby_string*" ))
 
   for binary_name in "${binaries[@]}" ; do
 
-    full_binary_path="$rvm_bin_path/$binary_name"
+    full_binary_path="${rvm_bin_path:-"$rvm_path/bin"}/$binary_name"
 
     if [[ -L "$full_binary_path" ]] && "$rvm_path/scripts/match" "$(readlink "$full_binary_path")" "$rvm_ruby_string"; then
       rm -f "$full_binary_path"
@@ -1555,11 +1589,11 @@ __rvm_post_install() {
 
     for binary in "${binaries[@]}" ; do
 
-      if [[ -e "$rvm_ruby_home/bin/$binary" || -e "$rvm_ruby_src_path/bin/$binary" ]] ; then
+      if [[ -e "$rvm_ruby_home/bin/$binary" || -e "${rvm_src_path:-"$rvm_path/src"}/$rvm_ruby_string/bin/$binary" ]] ; then
 
-        if [[ "$rvm_ruby_src_path" != "$rvm_ruby_home" && -f "$rvm_ruby_src_path/bin/$binary" ]] ; then
+        if [[ "${rvm_src_path:-"$rvm_path/src"}/$rvm_ruby_string" != "$rvm_ruby_home" && -f "${rvm_src_path:-"$rvm_path/src"}/$rvm_ruby_string/bin/$binary" ]] ; then
 
-          cp -f "$rvm_ruby_src_path/bin/$binary" "$rvm_ruby_home/bin/$binary"
+          cp -f "${rvm_src_path:-"$rvm_path/src"}/$rvm_ruby_string/bin/$binary" "$rvm_ruby_home/bin/$binary"
 
         elif [[ -f "$rvm_ruby_gem_home/bin/$binary" ]] ; then
 
@@ -1603,13 +1637,14 @@ __rvm_generate_default_docs() {
 
   if [[ "$rvm_docs_flag" = "1" && "$rvm_ruby_interpreter" != "macruby" ]]; then
 
-    __rvm_run_with_env "docs.generate" "$rvm_ruby_string" "rvm docs generate-ri" "Attempting to generate ri documentation..."
+    __rvm_run_with_env "docs.generate" "$rvm_ruby_string" \
+      "rvm docs generate-ri" "Attempting to generate ri documentation..."
   fi
 }
 
 __rvm_rubygems_setup() {
 
-  local home path dir directory_name version_number ruby_lib_gem_path
+  local result home path dir directory_name version_number ruby_lib_gem_path
 
   if [[ -n "$(echo "$rvm_ruby_version" | awk '/^1\.9/')" ]] || [[ -n "$(echo "$rvm_ruby_interpreter" | awk '/^mput/')" ]] ; then
     install=0
@@ -1625,11 +1660,11 @@ __rvm_rubygems_setup() {
 
   if [[ "$install" -eq 0 ]] ; then
     # 1.9.X has it's own built-in gem command
-    __rvm_inject_ruby_shebang "$rvm_ruby_src_path/bin/gem"
+    __rvm_inject_ruby_shebang "${rvm_src_path:-"$rvm_path/src"}/$rvm_ruby_string/bin/gem"
 
     __rvm_inject_gem_env "$rvm_ruby_home/bin/gem"
 
-    cp "$rvm_ruby_src_path/bin/gem" "$rvm_ruby_home/bin/gem"
+    cp "${rvm_src_path:-"$rvm_path/src"}/$rvm_ruby_string/bin/gem" "$rvm_ruby_home/bin/gem"
 
     home="$GEM_HOME" ; path="$GEM_PATH" # Save
 
@@ -1637,7 +1672,8 @@ __rvm_rubygems_setup() {
 
       export GEM_HOME="$dir" ; export GEM_PATH="$dir" ; export BUNDLE_PATH="$dir"
 
-      __rvm_run "rubygems.update" "$rvm_ruby_home/bin/gem update --system" "$rvm_ruby_string - updating #rubygems for $dir"
+      __rvm_run "rubygems.update" \
+        "$rvm_ruby_home/bin/gem update --system" "$rvm_ruby_string - updating #rubygems for $dir"
 
     done
 
@@ -1688,11 +1724,11 @@ __rvm_rubygems_setup() {
 
     # Sanity check... If setup.rb is missing from the rubygems source path,
     # something went wrong. Cleanup, aisle 3!
-    if [[ ! -f "$rvm_src_path/$rvm_gem_package_name/setup.rb" ]]; then
-      rm -rf "$rvm_src_path/$rvm_gem_package_name"
+    if [[ ! -f "${rvm_src_path:-"$rvm_path/src"}/$rvm_gem_package_name/setup.rb" ]]; then
+      rm -rf "${rvm_src_path:-"$rvm_path/src"}/$rvm_gem_package_name"
     fi
 
-    if [[ ! -d "$rvm_src_path/$rvm_gem_package_name" ]] ; then
+    if [[ ! -d "${rvm_src_path:-"$rvm_path/src"}/$rvm_gem_package_name" ]] ; then
 
       "$rvm_path/scripts/log" "info" "Retrieving $rvm_gem_package_name"
 
@@ -1704,17 +1740,22 @@ __rvm_rubygems_setup() {
           "There has been an error while trying to fetch the source. Halting the installation." ; return $result
       fi
 
-      mkdir -p "$rvm_src_path/$rvm_gem_package_name"
+      if [[ ! -d "${rvm_src_path:-"$rvm_path/src"}/$rvm_gem_package_name" ]] ; then
+        mkdir -p "${rvm_src_path:-"$rvm_path/src"}/$rvm_gem_package_name"
+      fi
 
-      __rvm_run "rubygems.extract" "gunzip < \"$rvm_archives_path/$rvm_gem_package_name.tgz\" | tar xf - -C $rvm_src_path" "Extracting $rvm_gem_package_name ..."
+      __rvm_run "rubygems.extract" \
+        "gunzip < \"${rvm_archives_path:-"$rvm_path/archives"}/$rvm_gem_package_name.tgz\" | tar xf - -C ${rvm_src_path:-"$rvm_path/src"}" "Extracting $rvm_gem_package_name ..."
     fi
 
-    builtin cd "$rvm_src_path/$rvm_gem_package_name"
+    builtin cd "${rvm_src_path:-"$rvm_path/src"}/$rvm_gem_package_name"
 
-    __rvm_run "rubygems.install" "GEM_PATH=$rvm_ruby_gem_path GEM_HOME=$rvm_ruby_gem_home BUNDLE_PATH=$rvm_ruby_gem_home $rvm_ruby_home/bin/ruby $rvm_src_path/$rvm_gem_package_name/setup.rb"
+    __rvm_run "rubygems.install" \
+      "GEM_PATH="$rvm_ruby_gem_path:$rvm_ruby_global_gems_path" GEM_HOME=$rvm_ruby_gem_home BUNDLE_PATH=$rvm_ruby_gem_home $rvm_ruby_home/bin/ruby ${rvm_src_path:-"$rvm_path/src"}/$rvm_gem_package_name/setup.rb"
     result=$?
     if [[ $result -gt 0 ]] ; then
-      "$rvm_path/scripts/log" "warning" "$rvm_ruby_string - #warning Installation of rubygems $rvm_ruby_package_name did not complete successfully."
+      "$rvm_path/scripts/log" "warning" \
+        "$rvm_ruby_string - #warning Installation of rubygems $rvm_ruby_package_name did not complete successfully."
     fi
 
     __rvm_inject_ruby_shebang "$rvm_ruby_home/bin/gem"
@@ -1739,12 +1780,12 @@ __rvm_rubygems_setup() {
 
   fi
 
-  if [[ -s "$rvm_ruby_src_path/bin/rdoc" ]] ; then
-    __rvm_inject_ruby_shebang "$rvm_ruby_src_path/bin/rdoc"
+  if [[ -s "${rvm_src_path:-"$rvm_path/src"}/$rvm_ruby_string/bin/rdoc" ]] ; then
+    __rvm_inject_ruby_shebang "${rvm_src_path:-"$rvm_path/src"}/$rvm_ruby_string/bin/rdoc"
   fi
 
-  if [[ -s "$rvm_ruby_src_path/bin/rake" ]] ; then
-    __rvm_inject_ruby_shebang "$rvm_ruby_src_path/bin/rake"
+  if [[ -s "${rvm_src_path:-"$rvm_path/src"}/$rvm_ruby_string/bin/rake" ]] ; then
+    __rvm_inject_ruby_shebang "${rvm_src_path:-"$rvm_path/src"}/$rvm_ruby_string/bin/rake"
   fi
 
   return $result
@@ -1777,7 +1818,7 @@ __rvm_inject_gem_env() {
 
     elif [[ -n "$(head -n 1 $actual_file | awk '/bash/')" ]] ; then
 
-      string="GEM_HOME=\${GEM_HOME:-'$rvm_ruby_gem_home'}\nGEM_PATH=\${GEM_PATH:-'$rvm_ruby_gem_path'}\nPATH=$rvm_ruby_gem_home/bin:$rvm_ruby_global_gems_path/bin:$rvm_ruby_home/bin:\$PATH\nBUNDLE_PATH=\${BUNDLE_PATH:-'$rvm_ruby_gem_home'}\n"
+      string="GEM_HOME=\${GEM_HOME:-'$rvm_ruby_gem_home'}\nGEM_PATH=\${GEM_PATH:-'$rvm_ruby_gem_home:$rvm_ruby_global_gems_path'}\nPATH=$rvm_ruby_gem_home/bin:$rvm_ruby_global_gems_path/bin:$rvm_ruby_home/bin:\$PATH\nBUNDLE_PATH=\${BUNDLE_PATH:-'$rvm_ruby_gem_home'}\n"
 
     fi
 
@@ -1792,16 +1833,24 @@ __rvm_inject_gem_env() {
 }
 
 __rvm_actual_file() {
+
   if [[ -L $1 ]] ; then          # If the file is a symlink,
+
     actual_file="$(readlink $1)" # read the link target so we can preserve it.
+
   else
+
     actual_file="$1"
+
   fi
+
 }
 
 __rvm_manage_rubies() {
-  local manage_result=0
-  local bin_line=""
+
+  local manage_result bin_line
+
+  manage_result=0
 
   rvm_gemset_name=""
   rvm_ruby_selected_flag=0
@@ -1857,7 +1906,7 @@ __rvm_manage_rubies() {
 
           __rvm_unset_ruby_variables
         fi
-      done < <(builtin cd "$rvm_rubies_path" ; find . -maxdepth 1 -mindepth 1 -type d 2> /dev/null | sed -e 's#./##g')
+      done < <(builtin cd "$rvm_path/rubies" ; find . -maxdepth 1 -mindepth 1 -type d 2> /dev/null | sed -e 's#./##g')
 
     else
       "$rvm_path/scripts/log" "warn" \