rvm 1.0.4 → 1.0.5

data/scripts/set

@@ -2,17 +2,12 @@
 
 source "$rvm_scripts_path/base"
 
-if [[ -z "$1" ]] ; then
-  "$rvm_scripts_path/log" "error" "Action must be specified."
-  exit 1
-fi
-
 __rvm_attempt_single_exec() {
   # Return if we have multiple rubies. or we're not running exec.
   local ruby_string_lines="$(printf "$rvm_ruby_strings" | wc -l | __rvm_strip)"
   if [[ "$action" = "exec" && -n "$rvm_ruby_strings" && "$ruby_string_lines" = "0" ]]; then
     __rvm_become "$rvm_ruby_strings"
-    eval "exec $args"
+    eval "exec ${args[@]}"
   fi
   return 1
 }
@@ -28,12 +23,16 @@ __rvm_ruby_do() {
     binary="$(echo $action | sed 's#do$##')"
     if [[ -x "$rvm_ruby_home/bin/$binary" ]] ; then
       binary="$rvm_ruby_home/bin/$binary"
+
     elif [[ -x "$rvm_ruby_global_gems_path/bin/$binary" ]] ; then
       binary="$rvm_ruby_global_gems_path/bin/$binary"
+
     elif [[ -x "$rvm_ruby_gem_home/bin/$binary" ]] ; then
       binary="$rvm_ruby_gem_home/bin/$binary"
+
     elif [[ "system" = "$rvm_ruby_string" ]] && [[ -x "$(command -v $binary)" ]] ; then
       binary="$(basename $(command -v $binary) 2>/dev/null)"
+
     else
       "$rvm_scripts_path/log" "warn" "'$binary not found for $rvm_ruby_string' either does not exist or is not executable? :("
       __rvm_unset_ruby_variables
@@ -48,15 +47,18 @@ __rvm_ruby_do() {
     load_path="$(dirname $(command -v $binary) 2>/dev/null):$rvm_ruby_load_path"
     # TODO: the else case below should be run if $args =~ /\.rb$/
     if [[ "ruby" = "$(basename $binary)" ]] && [[ "$rvm_benchmark_flag" -ne 1 ]] ; then
+
       if "$rvm_scripts_path/match" "$args" "\.rb$" ; then
+
         if [[ -z "$prefix" ]] ; then prefix="-S" ; fi
+
         if ! "$rvm_scripts_path/match" "$args" "$prefix" ; then
           args="$prefix $args"
         fi
       fi
-      rvm_command="$binary $rvm_ruby_mode $rvm_ruby_require -I$load_path $args"
+      rvm_command="$(echo "$binary $rvm_ruby_mode $rvm_ruby_require -I$load_path $args")"
     else
-      rvm_command="$binary $rvm_ruby_mode $args"
+      rvm_command="$(echo "$binary $rvm_ruby_mode $args")"
     fi
   fi
 
@@ -64,8 +66,9 @@ __rvm_ruby_do() {
     \mkdir -p ./log/$rvm_ruby_string/
     \touch ./log/$rvm_ruby_string/$action.log ./log/$rvm_ruby_string/$action.error.log
     eval "$rvm_command" >> ./log/$rvm_ruby_string/$action.log 2>> ./log/$rvm_ruby_string/$action.error.log
+
   else
-    if [[ "$rvm_verbose_flag" != "0" ]] ; then
+    if [[ ${rvm_verbose_flag:-0} -gt 0 ]] ; then
       current_env="$(__rvm_environment_identifier)"
       if [[ "$current_env" != "$current_set_ruby" ]]; then
         current_env="$current_set_ruby ($current_env)"
@@ -83,8 +86,10 @@ __rvm_ruby_do() {
   else
     eval "errors=(${errors[*]} $string)"
   fi
+
   eval "rubies=(${rubies[*]} $string)"
   eval "statuses=(${statuses[*]} $result)"
+
   unset string
   __rvm_unset_ruby_variables
 }
@@ -117,7 +122,7 @@ __rvm_yaml() {
   total=${#rubies[*]}
   if [[ -n "${ZSH_VERSION:-""}" ]] ; then array_start=1 ; else array_start=0 ; fi
   for (( index = $array_start ; index < $total + $array_start ; index++ )) ; do
-    if [[ ! -z "$rvm_debug_flag" ]] ; then
+    if [[ ${rvm_debug_flag:-0} -gt 0 ]] ; then
       "$rvm_scripts_path/log" "debug" "${rubies[$index]}: ${statuses[$index]}"
     fi
     yaml="$yaml\n  \"${rubies[$index]}\": ${statuses[$index]}"
@@ -130,17 +135,17 @@ __rvm_yaml() {
 
 # Output the summary in a json format.
 __rvm_json() {
-  json="{"
-  json="$json\n  \"totals\": { \"rubies\": ${#rubies[*]}, \"successes\": ${#successes[*]}, \"errors\": ${#errors[*]} },"
-  json="$json\n  \"successful\": [$(echo \"${successes[*]}\" | sed 's# #", "#g' | sed 's#\"\"##')],"
-  json="$json\n  \"errors\": [$(echo \"${errors[*]}\" | sed 's# #", "#g' | sed 's#\"\"##')],"
-  json="$json\n  \"rubies\": {"
+  json="{
+\"totals\": { \"rubies\": ${#rubies[*]}, \"successes\": ${#successes[*]}, \"errors\": ${#errors[*]} },
+\"successful\": [$(echo \"${successes[*]}\" | sed 's# #", "#g' | sed 's#\"\"##')],
+\"errors\": [$(echo \"${errors[*]}\" | sed 's# #", "#g' | sed 's#\"\"##')],
+\"rubies\": { "
 
   total=${#rubies[*]}
   if [[ -n "${ZSH_VERSION:-""}" ]] ; then array_start=1 ; else array_start=0 ; fi
 
   for (( index = $array_start ; index < $total + $array_start ; index++ )) ; do
-    if [[ ! -z "$rvm_debug_flag" ]] ; then
+    if [[ ${rvm_debug_flag:-0} -gt 0 ]] ; then
       "$rvm_scripts_path/log" "debug" "${rubies[$index]}: ${statuses[$index]}"
     fi
     json="$json\n    {\"${rubies[$index]}\": ${statuses[$index]}}"
@@ -161,7 +166,12 @@ rubies=() ; successes=() ; errors=() ; statuses=()
 
 args=($*)
 action="${args[0]}"
-args="$(echo ${args[@]:1}) " # Strip trailing / leading / extra spacing.
+args=${args[@]:1}
+
+if [[ -z "$action" ]] ; then
+  "$rvm_scripts_path/log" "error" "Action must be specified."
+  exit 1
+fi
 
 if [[ "$action" == "ruby" ]] && echo "$args" | \grep -q  "^'--[^[:space:]]*'$" ; then
   "$rvm_scripts_path/log" "warn" "You called rvm ruby with the arguments $args which look like use options."
@@ -175,7 +185,7 @@ __rvm_attempt_single_exec
 
 for current_set_ruby in ${rvm_ruby_strings} ; do
   __rvm_ruby_do
-done; unset current_set_ruby
+done
 
 if [[ ! -z "$rvm_summary_flag" ]] ; then __rvm_summary ; fi
 if [[ ! -z "$rvm_yaml_flag" ]]    ; then __rvm_yaml    ; fi

data/scripts/snapshot

@@ -38,18 +38,20 @@ snapshot_save() {
 
   "$rvm_scripts_path/log" "info" "Backing up all of your gemsets"
   \mkdir -p "$snapshot_temp_path/gems"
-  __rvm_pushpop "$snapshot_temp_path/gems"
-  for snapshot_gemset in $("$rvm_scripts_path/list" gemsets strings) ; do
-    __rvm_become "$snapshot_gemset"
-    result="$?"
-    __error_on_result "$result" "Error becoming ruby $snapshot_gemset" && return "$result"
-    "$rvm_scripts_path/gemsets" export "${snapshot_gemset}.gems" >/dev/null
-    result="$?"
-    __error_on_result "$result" "Error exporting gemset contents for $snapshot_gemset" && return "$result"
-    \mkdir -p "./$snapshot_gemset/"
-    [[ -d "$GEM_HOME/cache/" ]] && \cp -R "$GEM_HOME/cache/" "./$snapshot_gemset/"
-  done; unset snapshot_gemset
-  __rvm_pushpop
+
+  (
+    builtin cd "$snapshot_temp_path/gems"
+    for snapshot_gemset in $("$rvm_scripts_path/list" gemsets strings) ; do
+      __rvm_become "$snapshot_gemset"
+      result="$?"
+      __error_on_result "$result" "Error becoming ruby $snapshot_gemset" && return "$result"
+      "$rvm_scripts_path/gemsets" export "${snapshot_gemset}.gems" >/dev/null
+      result="$?"
+      __error_on_result "$result" "Error exporting gemset contents for $snapshot_gemset" && return "$result"
+      \mkdir -p "./$snapshot_gemset/"
+      [[ -d "$GEM_HOME/cache/" ]] && \cp -R "$GEM_HOME/cache/" "./$snapshot_gemset/"
+    done; unset snapshot_gemset
+  )
 
   "$rvm_scripts_path/log" "info" "Backing up all of your installed rubies"
   echo '#!/usr/bin/env bash -e' > "$snapshot_temp_path/install-rubies.sh"
@@ -80,12 +82,13 @@ snapshot_save() {
 
   "$rvm_scripts_path/log" "info" "Compressing snapshotting"
   local destination_path="$PWD"
-  __rvm_pushpop "$snapshot_temp_path"
-  \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_pushpop
+  (
+    builtin cd "$snapshot_temp_path"
+    \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_scripts_path/log" "info" "Cleaning up"
   \rm -rf "$snapshot_temp_path"
@@ -113,11 +116,12 @@ snapshot_load() {
   \mkdir -p "$snapshot_temp_path"
 
   "$rvm_scripts_path/log" "info" "Extracting snapshot"
-  __rvm_pushpop "$snapshot_temp_path"
-  tar xzf "$snapshot_archive"
-  result="$?"
-  __error_on_result "$result" "Error extracting the archive '$snapshot_archive'" && return "$result"
-  __rvm_pushpop
+  (
+    builtin cd "$snapshot_temp_path"
+    tar xzf "$snapshot_archive"
+    result="$?"
+    __error_on_result "$result" "Error extracting the archive '$snapshot_archive'" && return "$result"
+  )
 
   "$rvm_scripts_path/log" "info" "Restoring user settings"
   \cp -f "$snapshot_temp_path/user" "$rvm_config_path/user"
@@ -137,20 +141,21 @@ snapshot_load() {
 
   export rvm_create_flag=1
   "$rvm_scripts_path/log" "info" "Setting up gemsets"
-  __rvm_pushpop "$snapshot_temp_path/gems"
-  for snapshot_gemset in $(\ls | \grep '\.gems$' | sed 's/.gems$//'); do
-    __rvm_become "$snapshot_gemset"
-    result="$?"
-    __error_on_result "$result" "Error becoming '$snapshot_gemset'" && return "$result"
-    \mkdir -p "$GEM_HOME/cache/"
-    \cp -Rf "$snapshot_gemset/" "$GEM_HOME/cache/"
-    result="$?"
-    __error_on_result "$result" "Error copying across cache for $snapshot_gemset" && return "$result"
-    "$rvm_scripts_path/gemsets" import "$snapshot_gemset" >/dev/null 2>&1
-    result="$?"
-    __error_on_result "$result" "Error importing gemset for $snapshot_gemset" && return "$result"
-  done; unset snapshot_gemset
-  __rvm_pushpop
+  (
+    builtin cd "$snapshot_temp_path/gems"
+    for snapshot_gemset in $(\ls | \grep '\.gems$' | sed 's/.gems$//'); do
+      __rvm_become "$snapshot_gemset"
+      result="$?"
+      __error_on_result "$result" "Error becoming '$snapshot_gemset'" && return "$result"
+      \mkdir -p "$GEM_HOME/cache/"
+      \cp -Rf "$snapshot_gemset/" "$GEM_HOME/cache/"
+      result="$?"
+      __error_on_result "$result" "Error copying across cache for $snapshot_gemset" && return "$result"
+      "$rvm_scripts_path/gemsets" import "$snapshot_gemset" >/dev/null 2>&1
+      result="$?"
+      __error_on_result "$result" "Error importing gemset for $snapshot_gemset" && return "$result"
+    done
+  )
 
   "$rvm_scripts_path/log" "info" "Restoring aliases"
   while read -r package_info; do

data/scripts/tools

@@ -14,7 +14,7 @@ tools_identifier() {
 
 tools_path_identifier() {
   if [[ -z "$1" || ! -d "$1" ]]; then
-    echo "Usage: rvm tools path-identifier 'path-to-heck'"
+    echo "Usage: rvm tools path-identifier 'path-to-check'"
     return 1
   fi
 
@@ -40,7 +40,7 @@ tools_strings() {
 
 args=($*)
 action="${args[0]}"
-args="$(echo ${args[@]:1}) " # Strip trailing / leading / extra spacing.
+args="$(echo ${args[@]:1})" # Strip trailing / leading / extra spacing.
 
 [[ -z "$action" ]] && usage
 

data/scripts/utility

@@ -182,15 +182,15 @@ __rvm_remove_rvm_from_path() {
 
 # Run a specified command and log it.
 __rvm_run() {
-  local log_file_name="$1"
-  local command="$2"
-  local message="$3"
+  local log_file_name="${1:-""}"
+  local command="${2:-""}"
+  local message="${3:-""}"
 
   if [[ -z "$rvm_ruby_log_path" ]] ; then rvm_ruby_log_path="$rvm_log_path" ; fi
 
   if [[ -n "$message" ]] ; then "$rvm_scripts_path/log" "info" "$message" ; fi
 
-  if [[ -n "$rvm_debug_flag" ]] ; then
+  if [[ ${rvm_debug_flag:-0} -gt 0 ]] ; then
     "$rvm_scripts_path/log" "debug" "Executing: $command"
   fi
 
@@ -200,14 +200,15 @@ __rvm_run() {
 
   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
-    eval "$command" >> "$rvm_ruby_log_path/$log_file_name.log" 2>> "$rvm_ruby_log_path/$log_file_name.error.log"
-  else
-    eval "nice -n $rvm_niceness $command" >> $rvm_ruby_log_path/$log_file_name.log 2>> $rvm_ruby_log_path/$log_file_name.error.log
-  fi ; local result=$?
-
-  if [[ $result -gt 0 ]] ; then
-    "$rvm_scripts_path/log" "error" "Error running '$command', please check $rvm_ruby_log_path/$log_file_name*.log" ; __rvm_pushpop
+  (
+    if [[ -z "${rvm_niceness:-""}" || "0" = "${rvm_niceness:-""}" ]] ; then
+      eval "$command" >> "$rvm_ruby_log_path/$log_file_name.log" 2>> "$rvm_ruby_log_path/$log_file_name.error.log"
+    else
+      eval "nice -n $rvm_niceness $command" >> $rvm_ruby_log_path/$log_file_name.log 2>> $rvm_ruby_log_path/$log_file_name.error.log
+    fi
+  )
+  local result=$? ; if [[ $result -gt 0 ]] ; then
+    "$rvm_scripts_path/log" "error" "Error running '$command', please check $rvm_ruby_log_path/$log_file_name*.log"
   fi
 
   return $result
@@ -226,7 +227,7 @@ __rvm_run_with_env() {
 
   if [[ -n "$message" ]] ; then "$rvm_scripts_path/log" "info" "$message" ; fi
 
-  if [[ -n "$rvm_debug_flag" ]] ; then
+  if [[ ${rvm_debug_flag:-0} -gt 0 ]] ; then
     "$rvm_scripts_path/log" "debug" "Executing: $command in environment "$env_name""
   fi
 
@@ -236,32 +237,38 @@ __rvm_run_with_env() {
 
   echo "[$(date +'%Y-%m-%d %H:%M:%S')] $command # under $env_name" | 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
-    eval "__rvm_with_env '$env_name' '$command'" >> "$rvm_ruby_log_path/$log_file_name.log" 2>> "$rvm_ruby_log_path/$log_file_name.error.log"
-  else
-    eval "nice -n $rvm_niceness __rvm_with_env '$env_name' '$command'" >> $rvm_ruby_log_path/$log_file_name.log 2>> $rvm_ruby_log_path/$log_file_name.error.log
-  fi ; result=$?
-
-  if [[ $result -gt 0 ]] ; then
-    "$rvm_scripts_path/log" "error" "Error running '$command' under $env_name, please check $rvm_ruby_log_path/$log_file_name*.log" ; __rvm_pushpop
+  (
+    if [[ -z "${rvm_niceness:-""}" || $rvm_niceness -eq 0 ]] ; then
+      eval "__rvm_with_env '$env_name' '$command'" >> "$rvm_ruby_log_path/$log_file_name.log" 2>> "$rvm_ruby_log_path/$log_file_name.error.log"
+    else
+      eval "nice -n $rvm_niceness __rvm_with_env '$env_name' '$command'" >> $rvm_ruby_log_path/$log_file_name.log 2>> $rvm_ruby_log_path/$log_file_name.error.log
+    fi
+  )
+  result=$? ; if [[ $result -gt 0 ]] ; then
+    "$rvm_scripts_path/log" "error" "Error running '$command' under $env_name, please check $rvm_ruby_log_path/$log_file_name*.log"
   fi
 
   return $result
 }
 
-# Unset both rvm variables as well as ruby-specific variables
+__rvm_nuke_rvm_variables() {
+  unset rvm_head_flag $(env | awk -F= '/^rvm_/{print $1" "}')
+}
+
+# Unset ruby-specific variables
+__rvm_unset_ruby_variables() {
+  unset rvm_head_flag $(env | awk -F= '/^rvm_ruby_/{printf $1" "}')
+}
+
+# TODO: Should be able to...
+#   Unset both rvm variables as well as ruby-specific variables
 # Preserve gemset if 'rvm_sticky' is set (persist gemset unless clear is explicitely called).
 __rvm_cleanse_variables() {
   __rvm_unset_ruby_variables
 
   if [[ ${rvm_sticky_flag:-0} -eq 1 ]] ; then export rvm_gemset_name ; else unset rvm_gemset_name  ; fi
 
-  unset rvm_action rvm_irbrc_file rvm_command rvm_error_message rvm_url rvm_force_flag rvm_all_flag rvm_reconfigure_flag rvm_make_flags rvm_bin_flag rvm_import_flag rvm_export_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 rvm_uninstall_flag rvm_install_flag rvm_llvm_flag rvm_ruby_bits rvm_sticky_flag rvm_rvmrc_flag rvm_gems_flag rvm_only_path_flag rvm_docs_flag rvm_ruby_aliases rvm_patch_names rvm_clang_flag rvm_install_arguments rvm_dump_environment_flag rvm_ruby_alias
-}
-
-# Unset ruby-specific variables
-__rvm_unset_ruby_variables() {
-  unset rvm_ruby_interpreter rvm_ruby_version rvm_url 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_release_version 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_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_ruby_package_file rvm_ruby_package_name rvm_ruby_gem_path rvm_ruby_name rvm_ruby_strings rvm_ruby_repo_path
+  unset rvm_action rvm_irbrc_file rvm_command rvm_error_message rvm_force_flag rvm_all_flag rvm_reconfigure_flag rvm_make_flags rvm_bin_flag rvm_import_flag rvm_export_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 rvm_uninstall_flag rvm_install_flag rvm_llvm_flag rvm_ruby_bits rvm_sticky_flag rvm_rvmrc_flag rvm_gems_flag rvm_only_path_flag rvm_docs_flag rvm_ruby_aliases rvm_patch_names rvm_clang_flag rvm_install_arguments rvm_dump_environment_flag rvm_ruby_alias
 }
 
 # Usage: __rvm_with_env 'env-name' 'command'
@@ -301,13 +308,6 @@ __rvm_ensure_has_18_compat_ruby() {
   return 0
 }
 
-__rvm_inherit_trace_flag() {
-  if [[ -n "$rvm_trace_flag" ]]; then
-    set -x ; export rvm_trace_flag
-  fi
-  return 0
-}
-
 # Cleans up temp folders for a given prefix,
 # typically the current process id.
 __rvm_cleanup_temp_for() {
@@ -322,13 +322,10 @@ __rvm_cleanup_temp_for() {
   exit
 }
 
-__rvm_cleanup_temp_on_exit() {
-  trap "__rvm_cleanup_temp_for '$$'" 0 1 2 3 15
-}
-
 __rvm_set_rvmrc() {
   if [[ "$HOME" != "$PWD" ]] ; then
-    if [[ ${rvm_verbose_flag:-0} -eq 1 ]] ; then flags="use " ; fi
+
+    if [[ ${rvm_verbose_flag:-0} -gt 0 ]] ; then flags="use " ; fi
 
     if [[ -s .rvmrc ]] ; then
       mv .rvmrc .rvmrc.$(date +%m.%d.%Y-%H:%M:%S)
@@ -373,7 +370,7 @@ __rvm_benchmark() {
   rvm_ruby_args="$rvm_tmp_path/$$.rb"
   rvm_benchmark_flag=1
   rvm_action="ruby"
-  if [[ -n "$rvm_debug_flag" ]] ; then printf "\n$rvm_tmp_path/$$.rb:\n$(cat $rvm_tmp_path/$$.rb)" ; fi
+  if [[ ${rvm_debug_flag:0} -gt 0 ]] ; then printf "\n$rvm_tmp_path/$$.rb:\n$(cat $rvm_tmp_path/$$.rb)" ; fi
   # Override ruby string stuff, pass through.
   local old_rvm_ruby_string=$rvm_ruby_string
   # TODO: We can likely do this in a subshell in order to preserve the original environment?
@@ -502,50 +499,46 @@ __rvm_initialize() {
 
 # Update rubygems or binscripts based on CLI selection.
 __rvm_update() {
-  __rvm_pushpop $rvm_path
+  (
+    builtin cd "$rvm_path"
 
-  if [[ ${rvm_head_flag:-0} -eq 1 || ${rvm_self_flag:-0} -eq 1 || "update" = "${rvm_action:-""}" || ${rvm_update_flag:-0} -eq 1 ]] ; then
-    __rvm_version
-    __rvm_update_rvm
-  fi
+    if [[ ${rvm_head_flag:-0} -eq 1 || ${rvm_self_flag:-0} -eq 1 || "update" = "${rvm_action:-""}" || ${rvm_update_flag:-0} -eq 1 ]] ; then
+      __rvm_version
+      __rvm_update_rvm
+    fi
 
-  [[ ${rvm_bin_flag:-0} -eq 1 ]] && __rvm_bin_scripts
+    [[ ${rvm_bin_flag:-0} -eq 1 ]] && __rvm_bin_scripts
 
-  # Update to the latest rubygems.
-  [[ ${rvm_rubygems_flag:-0} -eq 1 ]] && "$rvm_scripts_path/rubygems" current
+    # Update to the latest rubygems.
+    [[ ${rvm_rubygems_flag:-0} -eq 1 ]] && "$rvm_scripts_path/rubygems" current
 
+  )
   unset rvm_update_flag rvm_action rvm_self_flag rvm_ruby_revision rvm_bin_flag rvm_rubygems_flag
-
-  __rvm_pushpop
-
   return 0
 }
 
 # Update rvm using rubygems
 # If --head was specified, update from git repository master branch.
 __rvm_update_rvm() {
-
   \mkdir -p "$rvm_src_path"
-
-  __rvm_pushpop "$rvm_src_path"
-
-  if [[ ${rvm_head_flag:-0} -eq 1 ]] ; then
-    if [[ -d "$rvm_src_path/rvm/.git" ]] ; then
-      builtin cd "$rvm_src_path/rvm/" && git pull origin master && ./scripts/install
+  (
+    builtin cd "$rvm_src_path"
+    if [[ ${rvm_head_flag:-0} -eq 1 ]] ; then
+      if [[ -d "$rvm_src_path/rvm/.git" ]] ; then
+        builtin cd "$rvm_src_path/rvm/" && git pull origin master && ./scripts/install
+      else
+        builtin cd "$rvm_src_path" && ( git clone --depth 1 git://github.com/wayneeseguin/rvm.git || git clone http://github.com/wayneeseguin/rvm.git ) && builtin cd rvm/ && ./scripts/install
+      fi
     else
-      builtin cd "$rvm_src_path" && ( git clone --depth 1 git://github.com/wayneeseguin/rvm.git || git clone http://github.com/wayneeseguin/rvm.git ) && builtin cd rvm/ && ./scripts/install
-    fi
-  else
-    stable_version="$(curl -s http://rvm.beginrescueend.com/releases/stable-version.txt)"
+      stable_version="$(curl -s http://rvm.beginrescueend.com/releases/stable-version.txt)"
 
-    __rvm_run "fetch" "$rvm_scripts_path/fetch 'http://rvm.beginrescueend.com/releases/rvm-${stable_version}.tar.gz'" "fetching rvm-${stable_version}.tar.gz"
+      __rvm_run "fetch" "$rvm_scripts_path/fetch 'http://rvm.beginrescueend.com/releases/rvm-${stable_version}.tar.gz'" "fetching rvm-${stable_version}.tar.gz"
 
-    __rvm_run "extract" "gunzip < \"$rvm_archives_path/rvm-${stable_version}.tar.gz\" | tar xf - -C $rvm_src_path" "Extracting rvm-${stable_version}.tar.gz ..."
+      __rvm_run "extract" "gunzip < \"$rvm_archives_path/rvm-${stable_version}.tar.gz\" | tar xf - -C $rvm_src_path" "Extracting rvm-${stable_version}.tar.gz ..."
 
-    __rvm_run "install" "builtin cd $rvm_src_path/rvm-${stable_version}/ ; ./install" "Installing rvm-${stable_version}..."
-  fi
-
-  __rvm_pushpop
+      __rvm_run "install" "builtin cd $rvm_src_path/rvm-${stable_version}/ ; ./install" "Installing rvm-${stable_version}..."
+    fi
+  )
 
   rvm_hook="after_update" ; source "$rvm_scripts_path/hook"
 
@@ -592,17 +585,6 @@ __rvm_irbrc() {
   return $?
 }
 
-# Push or Pop a directory based on zero or one directory argument provided.
-__rvm_pushpop() {
-  if [[ -z "$1" ]] ; then
-    popd > /dev/null 2>&1
-  else
-    pushd "$1" > /dev/null 2>&1
-  fi
-
-  return $?
-}
-
 # Save or restore the rvm's state. This is a toggle action.
 # Meant for use before and after an operation that might reset the currently selected ruby.
 __rvm_state() {
@@ -661,9 +643,9 @@ __rvm_make_flags() {
       : # Do nothing ?
     elif [[ "$(sysctl -n hw.cpu64bit_capable)" = 1 || "$(sysctl -n hw.optional.x86_64)" = 1 ]] ; then
       #   64 bit capable
-      if [[ "-arch x86_64" = "$rvm_archflags" ]] ; then
+      if [[ "-arch x86_64" = "${rvm_archflags:-""}" ]] ; then
         rvm_ruby_configure_flags="${rvm_ruby_configure_flags} --build=x86_64-apple-darwin$(uname -r) --host=x86_64-apple-darwin$(uname -r)"
-      elif [[ "-arch i386" = "$rvm_archflags" ]] ; then
+      elif [[ "-arch i386" = "${rvm_archflags:-""}" ]] ; then
         rvm_ruby_configure_flags="${rvm_ruby_configure_flags} --build=i386-apple-darwin$(uname -r) --host=i386-apple-darwin$(uname -r)"
       else
         rvm_archflags="-arch x86_64"
@@ -671,10 +653,12 @@ __rvm_make_flags() {
       fi
     fi
 
-    if [[ -n "$rvm_archflags" ]] ; then
+    if [[ -n "${rvm_archflags:-""}" ]] ; then
       ARCHFLAGS="$rvm_archflags" ; export ARCHFLAGS
       # Use the latest sdk available.
-      if [[ -z "$rvm_sdk" ]] ; then rvm_sdk="$(/usr/bin/basename -a /Developer/SDKs/* | awk '/^M/' | sort | tail -n 1)" ; fi
+      if [[ -z "${rvm_sdk:-""}" ]] ; then
+        rvm_sdk="$(/usr/bin/basename -a /Developer/SDKs/* | awk '/^M/' | sort | tail -n 1)"
+      fi
       CFLAGS="${CFLAGS:-"-isysroot /Developer/SDKs/$rvm_sdk $rvm_archflags"}" ; export CFLAGS
       LDFLAGS="${LDFLAGS:-"-Wl,-syslibroot /Developer/SDKs/$rvm_sdk $rvm_archflags"}" ; export LDFLAGS
       # CXXFLAGS="-mmacosx-version-min="$(sw_vers -productVersion | awk -F'.' '{print $1"."$2}')" -isysroot /Developer/SDKs/$rvm_sdk " ; export CXXFLAGS
@@ -708,7 +692,6 @@ __rvm_become() {
 
 __rvm_ensure_has_environment_files() {
   local environment_identifier="$(__rvm_environment_identifier)"
-
   local file_name="${rvm_environments_path}/$environment_identifier"
 
   if [[ ! -s "$file_name" ]] ; then
@@ -717,9 +700,9 @@ __rvm_ensure_has_environment_files() {
     echo "export PATH=\"${rvm_ruby_gem_home}/bin:${rvm_ruby_global_gems_path}/bin:${rvm_ruby_home}/bin:${rvm_bin_path}:\$PATH\"" > "$file_name"
 
     for variable in RUBY_VERSION GEM_HOME GEM_PATH BUNDLE_PATH MY_RUBY_HOME IRBRC rvm_ruby_string rvm_gemset_name MAGLEV_HOME ; do
-      eval "export $variable"
 
-      eval "value=\$${variable}"
+      eval "export $variable"
+      eval "value=\${${variable}:-""}"
 
       if [[ -n "$value" ]] ; then
         printf "${variable}='$value'\nexport ${variable}\n" >> "$file_name"
@@ -941,36 +924,37 @@ $(cat $1)
 # Checks the rvmrc for the given directory. Note that if
 # argument is passed, it will be used instead of pwd.
 __rvm_project_rvmrc() {
-  declare -i rvm_project_rvmrc_default=${rvm_project_rvmrc_default:-0}
-  declare rvm_rvmrc_cwd="${rvm_rvmrc_cwd:-""}"
-  declare rvm_previous_environment="${rvm_previous_environment:-""}"
-
   local cwd
 
   # Get the first argument or the pwd.
   cwd="${1:-"$PWD"}"
+
   while : ; do
     if [[ -z "$cwd" || "$HOME" = "$cwd" || "/" = "$cwd" ]] ; then
-      if [[ -n "$rvm_rvmrc_cwd" ]] ; then
-        if [[ $rvm_project_rvmrc_default -eq 1 ]]; then
+      if [[ -n "${rvm_rvmrc_cwd:-""}" ]] ; then
+        if [[ ${rvm_project_rvmrc_default:-0} -eq 1 ]]; then
           __rvm_load_env_file "default"
-        elif [[ -n "$rvm_previous_environment" ]] ; then
+        elif [[ -n "${rvm_previous_environment:-""}" ]] ; then
           __rvm_load_env_file "$rvm_previous_environment"
         fi
-        rvm_rvmrc_cwd=""
-        rvm_previous_environment=""
+        unset rvm_rvmrc_cwd rvm_previous_environment
       fi
       break
     else
       if [[ -f "$cwd/.rvmrc" ]] ; then
-        if [[ "$rvm_rvmrc_cwd" != "$cwd" ]] ; then
+
+        if [[ "${rvm_rvmrc_cwd:-""}" != "$cwd" ]] ; then
+
           __rvm_check_rvmrc_trustworthiness "$cwd/.rvmrc"
+
           local rvm_trustworthiness_result="$?"
+
           if  [[ "$rvm_trustworthiness_result" = 0 ]]; then
             rvm_previous_environment="$(__rvm_environment_identifier)"
             rvm_rvmrc_cwd="$cwd"
             source "$cwd/.rvmrc"
             return 0
+
           else
             return "$rvm_trustworthiness_result"
           fi
@@ -1023,8 +1007,8 @@ __rvm_recorded_install_command() {
 __rvm_environment_identifier() {
   local path
   local string
-  path="$(command -v ruby)"
-  string="${path//*rubies\//}"
+  path="${GEM_HOME:-""}"
+  string="${path//*gems\//}"
   string="${string//\/*/}"
   echo "${string:-system}"
   return $?
@@ -1032,21 +1016,29 @@ __rvm_environment_identifier() {
 
 __rvm_expand_ruby_string() {
   local string="$1"
+
   if [[ -z "$string" || "$string" = "all" ]]; then
     "$rvm_scripts_path/list" strings | tr ' ' "\n" | __rvm_strip
+
   elif [[ "$string" = "all-gemsets" ]]; then
     "$rvm_scripts_path/list" gemsets strings | __rvm_strip
+
   elif [[ "$string" = "default-with-rvmrc" || "$string" = "rvmrc" ]]; then
     "$rvm_scripts_path/tools" path-identifier "$PWD"
+
   elif [[ "$string" == "all-rubies" || "$string" = "rubies" ]]; then
     "$rvm_scripts_path/list" rubies strings | __rvm_strip
+
   elif [[ "$string" == "current-ruby" || "$string" = "gemsets" ]]; then
     local current_ruby="$(__rvm_environment_identifier | awk -F"$rvm_gemset_separator" '{print $string}')"
     rvm_silence_logging=1 "$rvm_scripts_path/gemsets" list | sed "s/^/$current_ruby$rvm_gemset_separator/"  | __rvm_strip
+
   elif [[ "$string" = "current" ]]; then
     __rvm_environment_identifier
+
   elif [[ "$string" = "aliases" ]]; then
     awk -F= '{print $string}' < "$rvm_config_path/alias" | __rvm_strip
+
   else
     echo "$string" | tr "," "\n" | __rvm_strip
   fi