rvm 1.0.7 → 1.0.8

data/scripts/rvm-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/selector

@@ -107,7 +107,7 @@ __rvm_select() {
         rvm_ruby_package_name="${rvm_ruby_interpreter}-${rvm_ruby_version}"
         rvm_ruby_url="${rvm_ruby_url:-"$maglev_url/${rvm_ruby_package_file}.${rvm_archive_extension}"}"
         rvm_gemstone_url="${rvm_gemstone_url:-"$maglev_url/${rvm_gemstone_package_file}.${rvm_archive_extension}"}"
-        export MAGLEV_HOME="$rvm_rubies_path/$rvm_ruby_string"
+        export MAGLEV_HOME="$rvm_path/rubies/$rvm_ruby_string"
       fi
     ;;
 
@@ -218,42 +218,40 @@ __rvm_select() {
     fi
 
     rvm_ruby_package_name="${rvm_ruby_package_name:-${rvm_ruby_string//-n*}}"
-    rvm_ruby_home="$rvm_rubies_path/$rvm_ruby_string"
-    rvm_ruby_log_path="$rvm_log_path/$rvm_ruby_string"
-    rvm_ruby_repo_path="$rvm_repo_path/$rvm_ruby_string"
-    rvm_ruby_src_path="$rvm_src_path/$rvm_ruby_string"
+    rvm_ruby_home="$rvm_path/rubies/$rvm_ruby_string"
     rvm_ruby_binary="$rvm_ruby_home/bin/ruby"
     rvm_ruby_irbrc="$rvm_ruby_home/.irbrc"
-    rvm_ruby_gem_home="${rvm_gems_path}/${rvm_ruby_string}"
-    rvm_ruby_gem_path="${rvm_ruby_gem_home}:${rvm_ruby_gem_home}@global"
 
     if [[ "maglev" = "$rvm_ruby_interpreter" ]] ; then
       export MAGLEV_HOME="$rvm_ruby_home"
       export GEMSTONE_GLOBAL_DIR=$MAGLEV_HOME
     fi
 
+    rvm_ruby_gem_home="${rvm_gems_path:-"$rvm_path/gems"}/${rvm_ruby_string}"
+
     if [[ ! -z "$rvm_gemset_name" ]] ; then
       rvm_ruby_gem_home="${rvm_ruby_gem_home}${rvm_gemset_separator:-"@"}${rvm_gemset_name}"
-      rvm_ruby_gem_path="${rvm_ruby_gem_home}:${rvm_gems_path}/${rvm_ruby_string}${rvm_gemset_separator:-"@"}global"
+      rvm_ruby_gem_path="${rvm_ruby_gem_home}:${rvm_gems_path:-"$rvm_path/gems"}/${rvm_ruby_string}${rvm_gemset_separator:-"@"}global"
     fi
 
+    rvm_ruby_global_gems_path="${rvm_ruby_gem_home%%${rvm_gemset_separator:-"@"}*}${rvm_gemset_separator:-"@"}global"
+    rvm_ruby_gem_path="${rvm_ruby_gem_home}:${rvm_ruby_global_gems_path}"
+
     rvm_ruby_selected_flag=1
 
-    \mkdir -p "$rvm_ruby_log_path"
+    if [[ ! -d "{rvm_log_path:-"$rvm_path/log"}/$rvm_ruby_string" ]] ; then
+      \mkdir -p "${rvm_log_path:-"$rvm_path/log"}/$rvm_ruby_string"
+    fi
+
+    export rvm_head_flag $(env | awk -F= -v ORS=' ' '/^rvm_/{print $1}')
 
-    export rvm_ruby_interpreter rvm_ruby_version rvm_ruby_repo_url rvm_ruby_package_name rvm_ruby_url rvm_ruby_patch_level rvm_ruby_configure rvm_configure_flags rvm_ruby_make rvm_ruby_make_install rvm_ruby_revision rvm_ruby_tag rvm_ruby_release_version rvm_ruby_major_version rvm_ruby_minor_version rvm_gemset_name rvm_gems_path rvm_ruby_gem_home rvm_path rvm_src_path rvm_bin_path rvm_ruby_binary rvm_ruby_home rvm_log_path rvm_ruby_log_path rvm_src_path rvm_ruby_src_path rvm_ruby_irbrc rvm_ruby_selected_flag rvm_ruby_string
   else
     rvm_ruby_interpreter="${rvm_ruby_interpreter:-system}"
   fi
 }
 
 __rvm_use() {
-  rvm_gemset_name="${rvm_gemset_name:-""}"
-  rvm_ruby_gem_home="${rvm_ruby_gem_home:-""}"
-  rvm_wrapper_name="${rvm_wrapper_name:-""}"
-  rvm_ruby_alias="${rvm_ruby_alias:-""}"
-
-  local new_path binary full_binary_path
+  local new_path binary full_binary_path rvm_ruby_gem_home
 
   if [[ ${rvm_ruby_selected_flag:-0} -eq 0 ]] ; then __rvm_select "$@" ; fi
 
@@ -263,16 +261,16 @@ __rvm_use() {
 
     unset GEM_HOME GEM_PATH BUNDLE_PATH MY_RUBY_HOME RUBY_VERSION IRBRC
 
-    new_path="$rvm_bin_path:$(__rvm_remove_rvm_from_path ; printf "$PATH")"
+    new_path="${rvm_bin_path:-"$rvm_path/bin"}:$(__rvm_remove_rvm_from_path ; printf "$PATH")"
 
-    if [[ -s $rvm_config_path/system ]] ; then
+    if [[ -s $rvm_path/config/system ]] ; then
 
-      \grep "MY_RUBY_HOME='$rvm_rubies_path" "$rvm_config_path/system" > /dev/null
+      \grep "MY_RUBY_HOME='$rvm_path/rubies" "$rvm_path/config/system" > /dev/null
 
       if [[ $? -eq 0 ]] ; then
-        [[ -f "$rvm_config_path/system" ]] && \rm -f $rvm_config_path/system # 'system' should *not* point to an rvm ruby.
+        [[ -f "$rvm_path/config/system" ]] && \rm -f $rvm_path/config/system # 'system' should *not* point to an rvm ruby.
       else
-        source "$rvm_config_path/system"
+        source "$rvm_path/config/system"
       fi
     fi
 
@@ -281,7 +279,7 @@ __rvm_use() {
 
       for binary in ruby gem irb ri rdoc rake erb testrb ; do
 
-        full_binary_path="$rvm_bin_path/$binary"
+        full_binary_path="${rvm_bin_path:-"$rvm_path/bin"}/$binary"
 
         [[ -L "$full_binary_path" ]] && \rm -f "$full_binary_path"
       done
@@ -295,7 +293,7 @@ __rvm_use() {
 
   else
     GEM_HOME="$rvm_ruby_gem_home"
-    GEM_PATH="$rvm_ruby_gem_path"
+    GEM_PATH="$rvm_ruby_gem_home:$rvm_ruby_global_gems_path"
     BUNDLE_PATH="$rvm_ruby_gem_home"
     MY_RUBY_HOME="$rvm_ruby_home"
     RUBY_VERSION="$rvm_ruby_string"
@@ -325,7 +323,7 @@ __rvm_use() {
       "$rvm_path/scripts/log" "info" \
       "Using ${GEM_HOME/${rvm_gemset_separator:-'@'}/ with gemset }"
 
-    new_path="$GEM_HOME/bin:$rvm_ruby_global_gems_path/bin:$MY_RUBY_HOME/bin:$rvm_bin_path:$(__rvm_remove_rvm_from_path ; printf "$PATH")"
+    new_path="$GEM_HOME/bin:$rvm_ruby_global_gems_path/bin:$MY_RUBY_HOME/bin:${rvm_bin_path:-"$rvm_path/bin"}:$(__rvm_remove_rvm_from_path ; printf "$PATH")"
   fi
 
   # Export ruby string and gem set me for extrenal scripts to take advantage of them.
@@ -345,27 +343,27 @@ __rvm_use() {
 
   if [[ ${rvm_default_flag:-0} -eq 1 && "default" != "${rvm_ruby_interpreter:-""}" ]] ; then
 
-    if [[ "${rvm_selfcontained:-""}" = "0" ]] ; then
+    if [[ ${rvm_selfcontained:-""} -eq 0 ]] ; then
       # Sets up the default wrappers.
       "$rvm_path/scripts/wrapper" "$rvm_ruby_string" --no-prefix
     else
-      "$rvm_path/scripts/wrapper" "$rvm_path/scripts" "default"
+      "$rvm_path/scripts/wrapper" "$rvm_ruby_string" "default"
     fi
 
     if [[ "system" = "$rvm_ruby_interpreter" ]] ; then
       "$rvm_path/scripts/alias" delete default &> /dev/null
-      \find "$rvm_bin_path" -name 'default_*' -maxdepth 0 -delete
-      \rm -f "$rvm_config_path/default"
-      \rm -f "$rvm_environments_path/default"
-      \rm -rf "$rvm_wrappers_path/default"
+      \find "${rvm_bin_path:-"$rvm_path/bin"}" -name 'default_*' -maxdepth 0 -delete
+      \rm -f "$rvm_path/config/default"
+      \rm -f "$rvm_path/environments/default"
+      \rm -rf "$rvm_path/wrappers/default"
 
     else
       RUBY_VERSION="$("$rvm_ruby_home/bin/ruby" -v | sed 's#^\(.*\) (.*$#\1#')"
       export GEM_HOME GEM_PATH BUNDLE_PATH MY_RUBY_HOME RUBY_VERSION
       "$rvm_path/scripts/alias" delete default &> /dev/null
       "$rvm_path/scripts/alias" create default "$environment_id" >& /dev/null
-      \ln -nfs "$rvm_environments_path/$environment_id" "$rvm_environments_path/default"
-      \ln -nfs "$rvm_wrappers_path/$environment_id" "$rvm_wrappers_path/default"
+      \ln -nfs "$rvm_path/environments/$environment_id" "$rvm_path/environments/default"
+      \ln -nfs "$rvm_path/wrappers/$environment_id" "$rvm_path/wrappers/default"
     fi
   fi
 
@@ -444,8 +442,9 @@ __rvm_ruby_string() {
     if echo "${GEM_HOME:-""}" | grep -q "rvm" ; then
       # Current Ruby
       strings="${GEM_HOME##*\/}"
-      strings=("${strings/%${rvm_gemset_separator:-"@"}*}")
-      rvm_ruby_string=${strings[@]:(1)}
+      strings="${strings/%${rvm_gemset_separator:-"@"}*}"
+      rvm_ruby_string="$strings"
+      strings=(${strings//-/ })
     else
       strings=(system)
       rvm_ruby_string="system"
@@ -641,7 +640,7 @@ __rvm_gemset_select() {
 
   rvm_ruby_gem_home=${rvm_ruby_gem_home:-""}
   rvm_gemset_name=${rvm_gemset_name:-""}
-  rvm_ruby_global_gems_path="$rvm_path/gems/${rvm_ruby_string:-""}${rvm_gemset_separator:-"@"}global"
+  rvm_ruby_global_gems_path="${rvm_ruby_gem_home%%${rvm_gemset_separator:-"@"}*}${rvm_gemset_separator:-"@"}global"
 
   if [[ -z "${rvm_gemset_name:-""}" ]] ; then
 
@@ -660,11 +659,11 @@ __rvm_gemset_select() {
 
     if ! echo "${rvm_gemset_name:-""}" | grep -q "^[[:digit:]]\.[[:digit:]]" ; then
 
-      rvm_ruby_gem_home="$rvm_gems_path/${rvm_ruby_string}${rvm_gemset_separator:-"@"}${rvm_gemset_name}"
+      rvm_ruby_gem_home="${rvm_gems_path:-"$rvm_path/gems"}/${rvm_ruby_string}${rvm_gemset_separator:-"@"}${rvm_gemset_name}"
 
     else
       if [[ -n "${rvm_ruby_string:-""}" && "${rvm_ruby_interpreter:-""}" != "system" ]] ; then
-        rvm_ruby_gem_home="$rvm_gems_path/$rvm_ruby_string"
+        rvm_ruby_gem_home="${rvm_gems_path:-"$rvm_path/gems"}/$rvm_ruby_string"
 
       elif [[ -z "${GEM_HOME:-""}" && -n "$(command -v gem)" ]] ; then
         rvm_ruby_gem_home=$(gem env gemdir)
@@ -686,10 +685,10 @@ __rvm_gemset_select() {
     if [[ -n "${rvm_ruby_string:-""}" ]] ; then
 
       if [[ -z "${rvm_ruby_gem_home:-""}" || -n "${gemset:-""}" ]] ; then
-        rvm_ruby_gem_home="$rvm_gems_path/${rvm_ruby_string}${rvm_gemset_separator:-"@"}${rvm_gemset_name}"
+        rvm_ruby_gem_home="${rvm_gems_path:-"$rvm_path/gems"}/${rvm_ruby_string}${rvm_gemset_separator:-"@"}${rvm_gemset_name}"
 
       elif [[ -n "${gemset:-""}" && "${rvm_gemset_name:-""}" != "${gemset:-""}" ]] ; then
-        rvm_ruby_gem_home="$rvm_gems_path/${rvm_ruby_string}${rvm_gemset_separator:-"@"}${rvm_gemset_name}"
+        rvm_ruby_gem_home="${rvm_gems_path:-"$rvm_path/gems"}/${rvm_ruby_string}${rvm_gemset_separator:-"@"}${rvm_gemset_name}"
       fi
     else
       "$rvm_path/scripts/log" "error" "Gemsets can not be used with non rvm controlled rubies (currently)."
@@ -714,8 +713,8 @@ __rvm_gemset_select() {
   fi
 
   if [[ -z "${rvm_ruby_gem_home:-""}" && -n "${rvm_ruby_string:-""}" ]] ; then
-    rvm_ruby_gem_home="$rvm_gems_path/$rvm_ruby_string"
-    rvm_ruby_global_gems_path="$rvm_gems_path/$rvm_ruby_string${rvm_gemset_separator:-"@"}global"
+    rvm_ruby_gem_home="${rvm_gems_path:-"$rvm_path/gems"}/$rvm_ruby_string"
+    rvm_ruby_global_gems_path="${rvm_ruby_gem_home%%${rvm_gemset_separator}*}${rvm_gemset_separator:-"@"}global"
   fi
 
   rvm_ruby_gem_path="$rvm_ruby_gem_home:$rvm_ruby_global_gems_path"
@@ -759,7 +758,7 @@ __rvm_gemset_use() {
     rvm_ruby_gem_home="${GEM_HOME//${rvm_gemset_separator:-"@"}*}${rvm_gemset_separator:-"@"}${rvm_gemset_name}"
     GEM_HOME="$rvm_ruby_gem_home"
     BUNDLE_PATH="$rvm_ruby_gem_home"
-    GEM_PATH="$rvm_ruby_gem_home/bin:$(echo "$GEM_HOME" | sed 's/'${rvm_gemset_separator:-"@"}'.*$//')${rvm_gemset_separator:-"@"}global/bin"
+    GEM_PATH="$rvm_ruby_gem_home:$rvm_ruby_global_gems_path"
     export rvm_ruby_gem_home GEM_HOME BUNDLE_PATH GEM_PATH
 
     __rvm_use # Now ensure the selection takes effect for the environment.
@@ -771,10 +770,10 @@ __rvm_gemset_use() {
 __rvm_gemset_clear() {
   rvm_gemset_name="" ; shift # TODO: Is this shift necessary???
   rvm_ruby_gem_home="${GEM_HOME//${rvm_gemset_separator:-"@"}*}"
-  rvm_ruby_global_gems_path="$(echo "${GEM_HOME:-""}" | sed 's/'${rvm_gemset_separator:-"@"}'.*$//')${rvm_gemset_separator:-"@"}global"
+  rvm_ruby_global_gems_path="${rvm_ruby_gem_home%%${rvm_gemset_separator:-"@"}*}${rvm_gemset_separator:-"@"}global"
   GEM_HOME=$rvm_ruby_gem_home
   BUNDLE_PATH="$rvm_ruby_gem_home"
-  GEM_PATH="$rvm_ruby_gem_home/bin:$rvm_ruby_global_gems_path/bin"
+  GEM_PATH="$rvm_ruby_gem_home:$rvm_ruby_global_gems_path"
   export rvm_ruby_gem_home rvm_ruby_global_gems_path GEM_HOME BUNDLE_PATH GEM_PATH
   __rvm_use # Now ensure the selection takes effect for the environment.
 }

data/scripts/snapshot

@@ -17,27 +17,42 @@ __error_on_result() {
 snapshot_save() {
 
   if [[ -z "$1" ]]; then
-    echo "Usage: rvm snapshot save name" >&2
-    echo "Saves a snapshot to <name>.tar.gz in the current directory." >&2
+
+    printf "
+
+    Usage:
+
+      rvm snapshot save name
+
+    Description:
+
+    Saves a snapshot describing the rvm installation
+    to <name>.tar.gz in the current working directory.\
+
+    " >&2
+
     return 1
+
   fi
 
   # Create the temporary directory.
-  local snapshot_temp_path="$rvm_tmp_path/$$-snapshot"
-  \rm -rf "$snapshot_temp_path"
-  \mkdir -p "$snapshot_temp_path"
+  local snapshot_temp_path="${rvm_tmp_path:-"$rvm_path/tmp"}/$$-snapshot"
+
+  rm -rf "$snapshot_temp_path"
+
+  mkdir -p "$snapshot_temp_path"
 
   "$rvm_path/scripts/log" "info" "Backing up a list of aliases"
-  \cp "$rvm_config_path/alias" "$snapshot_temp_path/"
+  cp "$rvm_path/config/alias" "$snapshot_temp_path/"
 
   "$rvm_path/scripts/log" "info" "Backing up your user preferences"
-  \cp "$rvm_config_path/user" "$snapshot_temp_path/"
+  cp "$rvm_path/config/user" "$snapshot_temp_path/"
 
   "$rvm_path/scripts/log" "info" "Backing up your installed packages"
-  sed -e 's/-//' -e 's/^lib//' < "$rvm_config_path/packages" | awk -F= '{print $1}' | sort | uniq > "$snapshot_temp_path/packages"
+  sed -e 's/-//' -e 's/^lib//' < "$rvm_path/config/packages" | awk -F= '{print $1}' | sort | uniq > "$snapshot_temp_path/packages"
 
   "$rvm_path/scripts/log" "info" "Backing up all of your gemsets"
-  \mkdir -p "$snapshot_temp_path/gems"
+  mkdir -p "$snapshot_temp_path/gems"
 
   (
     builtin cd "$snapshot_temp_path/gems"
@@ -52,7 +67,7 @@ snapshot_save() {
 
       __error_on_result "$result" "Error exporting gemset contents for $snapshot_gemset" && return "$result"
 
-      \mkdir -p "./$snapshot_gemset/"
+      mkdir -p "./$snapshot_gemset/"
 
       [[ -d "$GEM_HOME/cache/" ]] && \cp -R "$GEM_HOME/cache/" "./$snapshot_gemset/"
 
@@ -60,44 +75,65 @@ snapshot_save() {
   )
 
   "$rvm_path/scripts/log" "info" "Backing up all of your installed rubies"
+
   echo '#!/usr/bin/env bash -e' > "$snapshot_temp_path/install-rubies.sh"
+
   echo "source \"\$rvm_path/scripts/rvm\" || true" >> "$snapshot_temp_path/install-rubies.sh"
-  local snapshot_ruby_name_file="$rvm_tmp_path/$$-rubies"
-  local snapshot_alias_name_file="$rvm_tmp_path/$$-aliases"
-  local snapshot_installable_file="$rvm_tmp_path/$$-installable"
+
+  local snapshot_ruby_name_file="${rvm_tmp_path:-"$rvm_path/tmp"}/$$-rubies"
+
+  local snapshot_alias_name_file="${rvm_tmp_path:-"$rvm_path/tmp"}/$$-aliases"
+
+  local snapshot_installable_file="${rvm_tmp_path:-"$rvm_path/tmp"}/$$-installable"
 
   "$rvm_path/scripts/alias" list | awk -F ' => ' '{print $1}' | sort | uniq 2>/dev/null > "$snapshot_alias_name_file"
+
   "$rvm_path/scripts/list" strings | \tr ' ' '\n' | sort | uniq > "$snapshot_ruby_name_file"
+
   comm -2 -3 "$snapshot_ruby_name_file" "$snapshot_alias_name_file" > "$snapshot_installable_file"
-  \rm -rf "$snapshot_ruby_name_file" "$snapshot_alias_name_file"
+
+  rm -rf "$snapshot_ruby_name_file" "$snapshot_alias_name_file"
 
   local snapshot_primary_ruby="$(\grep '^\(ree\|ruby-1.8.7\)' < "$snapshot_installable_file" | \grep -v '-head$' | sort -r | head -n1)"
+
   local snapshot_ruby_order="$snapshot_primary_ruby $(\grep -v "$snapshot_primary_ruby" < "$snapshot_installable_file")"
+
   for snapshot_ruby_name in $snapshot_ruby_order ; do
+
     snapshot_install_command="$(__rvm_recorded_install_command "$snapshot_ruby_name")"
+
     if [[ -n "$snapshot_install_command" ]]; then
+
       echo "rvm install $snapshot_install_command" | sed "s#$rvm_path#'\\\"\$rvm_path\\\"'#" >> "$snapshot_temp_path/install-rubies.sh"
+
     else
+
       __rvm_become "$snapshot_ruby_name"
+
       ruby "$rvm_path/lib/rvm/install_command_dumper.rb" >> "$snapshot_temp_path/install-rubies.sh"
+
     fi
+
     unset snapshot_install_command
+
   done; unset snapshot_ruby_name snapshot_primary_ruby
 
-  \rm -rf "$snapshot_installable_file"
+  rm -rf "$snapshot_installable_file"
 
   "$rvm_path/scripts/log" "info" "Compressing snapshotting"
+
   local destination_path="$PWD"
   (
     builtin cd "$snapshot_temp_path"
-    \rm -rf "$destination_path/$1.tar.gz"
+    rm -rf "$destination_path/$1.tar.gz"
     tar czf "$destination_path/$1.tar.gz" .
     result="$?"
     __error_on_result "$result" "Error creating archive $destination_path/$1.tar.gz" && return "$result"
   )
 
   "$rvm_path/scripts/log" "info" "Cleaning up"
-  \rm -rf "$snapshot_temp_path"
+
+  rm -rf "$snapshot_temp_path"
 
   "$rvm_path/scripts/log" "info" "Snapshot complete"
 }
@@ -116,7 +152,7 @@ snapshot_load() {
     return 1
   fi
 
-  local snapshot_temp_path="$rvm_tmp_path/$$-snapshot"
+  local snapshot_temp_path="${rvm_tmp_path:-"$rvm_path/tmp"}/$$-snapshot"
 
   \rm -rf "$snapshot_temp_path"
   \mkdir -p "$snapshot_temp_path"
@@ -130,7 +166,7 @@ snapshot_load() {
   )
 
   "$rvm_path/scripts/log" "info" "Restoring user settings"
-  \cp -f "$snapshot_temp_path/user" "$rvm_config_path/user"
+  \cp -f "$snapshot_temp_path/user" "$rvm_path/config/user"
 
   "$rvm_path/scripts/log" "info" "Installing rvm-managed packages"
   for snapshot_package in $(cat "$snapshot_temp_path/packages"); do