rvm 1.0.5 → 1.0.6

data/scripts/set

@@ -4,11 +4,12 @@ source "$rvm_scripts_path/base"
 
 __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
+  if [[ "$action" = "exec" && ${#rvm_ruby_strings[@]} -lt 2 ]]; then
     __rvm_become "$rvm_ruby_strings"
+
     eval "exec ${args[@]}"
   fi
+
   return 1
 }
 
@@ -16,9 +17,11 @@ __rvm_attempt_single_exec() {
 __rvm_ruby_do() {
   # Return on invalid rubies.
   __rvm_become "$current_set_ruby" || return 1
+
   if [[ "$action" = "exec" ]]; then
     # Exec is a special case.
     rvm_command="$args"
+
   else
     binary="$(echo $action | sed 's#do$##')"
     if [[ -x "$rvm_ruby_home/bin/$binary" ]] ; then
@@ -46,7 +49,7 @@ __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 [[ "ruby" = "$(basename $binary)" && "$rvm_benchmark_flag" -ne 1 ]] ; then
 
       if "$rvm_scripts_path/match" "$args" "\.rb$" ; then
 
@@ -153,7 +156,7 @@ __rvm_json() {
   done ; unset index array_start
   json="$json\n  }\n}"
 
-  \mkdir -p log
+  mkdir -p log
   printf "$json" | tee -a log/summary.json
 
   return ${#errors[*]}
@@ -178,12 +181,13 @@ if [[ "$action" == "ruby" ]] && echo "$args" | \grep -q  "^'--[^[:space:]]*'$" ;
   "$rvm_scripts_path/log" "warn" "Please note that 'rvm ruby' invokes set operations instead."
 fi
 
-rvm_ruby_strings="$(__rvm_expand_ruby_string "$rvm_ruby_strings")"
+rvm_ruby_strings=$(__rvm_expand_ruby_string "$rvm_ruby_strings")
+rvm_ruby_strings=(${rvm_ruby_strings//default}) # No quotes here is intentional.
 
 # Check for a single ruby && exec if present.
 __rvm_attempt_single_exec
 
-for current_set_ruby in ${rvm_ruby_strings} ; do
+for current_set_ruby in ${rvm_ruby_strings[@]} ; do
   __rvm_ruby_do
 done
 

data/scripts/snapshot

@@ -143,12 +143,12 @@ snapshot_load() {
   "$rvm_scripts_path/log" "info" "Setting up gemsets"
   (
     builtin cd "$snapshot_temp_path/gems"
-    for snapshot_gemset in $(\ls | \grep '\.gems$' | sed 's/.gems$//'); do
+    for snapshot_gemset in $(find * -iname '*.gems' -type f -maxdepth 0 | 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/"
+      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

data/scripts/update

@@ -383,7 +383,8 @@ for file in rvm rvmsudo rvm-shell rvm-auto-ruby ; do
   [[ -s "$rvm_bin_path/$file" ]] && chmod +x "$rvm_bin_path/$file"
 done; unset file
 printf "\n    Copying manpages into place."
-for man_file in $(ls "$install_source_path/man"); do
+
+for man_file in $(builtin cd "$install_source_path/man" ; find * -type f -maxdepth 0 -print); do
   rm -rf "$rvm_man_path/$man_file"
   cp -R "$install_source_path/man/$man_file" "$rvm_man_path/"
 done

data/scripts/upgrade

@@ -10,9 +10,13 @@ usage() {
 }
 
 confirm() {
-  printf "$1 (Y/n): "
+
   local confirmation_response
+
+  printf "$1 (Y/n): "
+
   read -r confirmation_response
+
   [[ -z "$confirmation_response" ]] || echo $confirmation_response | \grep -qi '^y\|^Y'
 }
 
@@ -26,33 +30,49 @@ expand_ruby_name() {
 }
 
 expand_existing_ruby() {
-  local prefix="$(expand_ruby_name "$1" | awk -F'-' '{print $1"-"$2}')"
-  local ruby_name
+  local prefix ruby_name
+
+  prefix="$(expand_ruby_name "$1" | awk -F'-' '{print $1"-"$2}')"
+
   while read -r ruby_name; do
+
     if [[ "$ruby_name" != "$expanded_destination"* ]]; then
       echo "$ruby_name" ; return 0
     fi
+
   done < <("$rvm_scripts_path/list" strings | tr ' ' '\n'  | sort -ur | \grep "^$prefix" | \grep -v '-head$' | head -n1)
+
   return 1
 }
 
 upgrade_ruby() {
+
   [[ -z "$source_ruby" ]] && die_with_error "Unable to find a source ruby. Please manually provide one."
 
   expanded_source="$(expand_ruby_name "$source_ruby")"
+
   [[ -z "$expanded_source" ]] && die_with_error "The source ruby was not a valid ruby string."
 
   confirm "Are you sure you wish to upgrade from $expanded_source to $expanded_destination?" || die_with_error "Cancelling upgrade."
 
   if [[ ! -d "$rvm_rubies_path/$expanded_destination" ]]; then
-    "$rvm_scripts_path/log" "info" "Installing new ruby $expanded_destination"
+
+    "$rvm_scripts_path/log" "info" \
+      "Installing new ruby $expanded_destination"
+
     $rvm_bin_path/rvm install "$expanded_destination"
+
     result="$?" ; [[ "$result" -gt 0 ]] && die_with_error "Unable to install ruby $expanded_destination. Please install it manually to continue." "$result"
+
   fi
 
-  "$rvm_scripts_path/log" "info" "Migrating gems from $expanded_source to $expanded_destination"
+  "$rvm_scripts_path/log" "info" \
+    "Migrating gems from $expanded_source to $expanded_destination"
+
   "$rvm_scripts_path/migrate" "$expanded_source" "$expanded_destination"
-  result="$?" ; [[ "$result" -gt 0 ]] && die_with_error "Error migrating gems." "$result"
+  result="$?"
+
+  [[ "$result" -gt 0 ]] && die_with_error "Error migrating gems." "$result"
 
   "$rvm_scripts_path/log" "info" "Upgrade complete!"
 }
@@ -67,6 +87,7 @@ args="$(echo ${args[@]:2}) " # Strip trailing / leading / extra spacing.
 expanded_destination="$(expand_ruby_name "$destination_ruby")"
 
 [[ -z "$source_ruby" ]] && die_with_error "The Source ruby was not specified, a valid ruby string, or not found."
+
 [[ -z "$expanded_destination" ]] && die_with_error "The destination ruby was not a valid ruby string, or not found."
 
 upgrade_ruby

data/scripts/utility

@@ -48,33 +48,48 @@ __rvm_teardown() {
 
 # Dump the current environment to a file.
 __rvm_dump_environment() {
+
   # Note: This assumes that there is a ','
-  local dump_environment_file="${rvm_dump_environment_flag/,*/}"
-  local dump_environment_type="${rvm_dump_environment_flag/*,/}"
+  local dump_environment_file dump_environment_type rvm_dump_environment_flag
+
+  dump_environment_file="${rvm_dump_environment_flag/,*/}"
+
+  dump_environment_type="${rvm_dump_environment_flag/*,/}"
+
   if [[ -n "$dump_environment_file" && -n "$dump_environment_type" ]]; then
+
     if [[ "$dump_environment_type" == "atheis"* ]] && [[ -f "$dump_environment_file" ]] ; then
       # TODO: Query Darcy about the ln.
       \rm -f "$dump_environment_file" && ln -s /dev/null "$dump_environment_file" >/dev/null 2>&1
+
     else
       "$rvm_scripts_path/environment-convertor" "$dump_environment_type" "$(__rvm_environment_identifier)" > "$dump_environment_file"
-      if [[ "$?" -gt 0 ]] && [[ -f "$dump_environment_file" ]] ; then
+      if [[ "$?" -gt 0 && -f "$dump_environment_file" ]] ; then
         \rm -f "$dump_environment_file"
       fi
     fi
-  fi ; unset rvm_dump_environment_flag
+  fi
+
   return 0
 }
 
 # Return a list of directories under a given base path.
 # Derived from rvm_ruby_string.
 __rvm_ruby_string_paths_under() {
-  local path="$1"
-  local path_parts="${rvm_ruby_string//-/ }"
+  local path path_parts
+
+  path="$1"
+
+  path_parts="${rvm_ruby_string//-/ }"
 
   while true ; do
+
     echo "$path/$path_parts" | sed -e 's# #/#g' -e 's#/$##g'
+
     [[ -z "$path_parts" ]] && break
+
     path_parts="$(echo "$path_parts" | awk '{$NF=""; print}' | __rvm_strip)"
+
   done
 
   return 0
@@ -83,7 +98,7 @@ __rvm_ruby_string_paths_under() {
 # Query the rvm key-value database for a specific key
 # Allow overrides from user specifications in $rvm_config_path/user
 __rvm_db() {
-  local value="" key="" variable=""
+  local value key variable
 
   key=${1:-""}
   variable=${2:-""}
@@ -111,29 +126,45 @@ is_a_function() { type $1 | head -n 1 | \grep -q "function" ; }
 
 __rvm_quote_args() {
   local quoted_string=""
+
   for quoted_argument in "$@"; do
+
     if printf "%s" "$quoted_argument" | \grep -vq "^[[:alnum:]]$"; then
+
       quoted_string="$quoted_string '$(printf "%s" "$quoted_argument" | sed "s/'/\'\\\'\'/g")'"
+
     else
       quoted_string="$quoted_string $quoted_argument"
     fi
   done
+
   echo "$quoted_string" | sed -e 's/^ *//g' -e 's/ *$//g'
+
   return 0
 }
 
 __rvm_quote_args_with_shift() {
+
   local shift_value="$1"; shift
-  while [[ "$shift_value" -gt 0 && "$#" -gt 0 ]]; do
-    shift ; ((shift_value--))
+
+  while [[ "$shift_value" -gt 0 && $# -gt 0 ]]; do
+
+    shift
+
+    ((shift_value--))
+
   done
+
   __rvm_quote_args "$@"
+
   return 0
 }
 
 __rvm_warn_on_rubyopt() {
-  if [[ -n "$RUBYOPT" ]]; then
-    "$rvm_scripts_path"/log "warn" "Please note: You have the RUBYOPT environment variable set and this may interfere with normal rvm operations. We sugges unsetting it."
+
+  if [[ -n "${RUBYOPT:-""}" ]]; then
+    "$rvm_scripts_path"/log "warn" \
+      "Please note: You have the RUBYOPT environment variable set and this may interfere with normal rvm operations. We sugges unsetting it."
     return 1
   else
     return 0
@@ -141,52 +172,76 @@ __rvm_warn_on_rubyopt() {
 }
 
 __rvm_strings() {
-  local strings=""
-  for rvm_ruby_string in $(echo ${rvm_ruby_args:-$rvm_ruby_string}) ; do
+  local strings ruby_strings
+
+  ruby_strings=($(echo ${rvm_ruby_args:-$rvm_ruby_string}))
+
+  for rvm_ruby_string in "${ruby_strings[@]}" ; do
     strings="$strings $(__rvm_select ; echo $rvm_ruby_string)"
   done
+
   echo $strings
+
   return 0
 }
 
 # Push an item onto a given array.
 __rvm_push() {
+
+  local array item
+
   array=$1 ; shift ; item=$2
+
   # TODO: allow loop over more arguments.
   eval "index=\$((\${#${array}[*]} + $__shell_array_start))"
+
   eval "${array}[${index}]=${item}"
-  unset array item
+
+  return 0
 }
 
 __rvm_set_path_variable() {
+
   if [[ -d "$1" ]] ; then
     eval "${path_variable}=${1}"
+
   else
-    "$rvm_scripts_path/log" "error" "'$1' is not a valid path."
-  fi ; unset path_variable
+    "$rvm_scripts_path/log" "error" \
+      "'$1' is not a valid path."
+    unset path_variable
+  fi
+
+  return 0
 }
 
 # Clean all *duplicate* items out of the path. (keep first occurrence of each)
 __rvm_clean_path() {
   PATH="$(echo $PATH | \tr -s ':' '\n' | awk '!($0 in a){a[$0];print}' | \tr -s '\n' ':' | sed 's#:$##')"
+
   export PATH
+
   builtin hash -r
 }
 
 # Clean all rvm items out of the current working path.
 __rvm_remove_rvm_from_path() {
-  PATH="$(echo $PATH | \tr -s ':' '\n' | \grep -v "$rvm_path" | \tr -s '\n' ':' | sed 's#:$##')"
+  PATH="${PATH//${rvm_path}*rvm\/bin:}"
+
   export PATH
+
   builtin hash -r
 }
 
 # Run a specified command and log it.
 __rvm_run() {
-  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
+  local log_file_name command message
+
+  log_file_name="${1:-""}"
+  command="${2:-""}"
+  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
 
@@ -207,8 +262,11 @@ __rvm_run() {
       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"
+  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
@@ -216,10 +274,13 @@ __rvm_run() {
 
 # Runs a command in a given env.
 __rvm_run_with_env() {
-  local log_file_name="${1:-""}"
-  local env_name="${2:-""}"
-  local command="${3:-""}"
-  local message="${4:-""}"
+
+  local log_file_name env_name comand message
+
+  log_file_name="${1:-""}"
+  env_name="${2:-""}"
+  command="${3:-""}"
+  message="${4:-""}"
 
   if [[ -z "$env_name" ]]; then env_name="$(__rvm_environment_identifier)"; fi
 
@@ -244,8 +305,11 @@ __rvm_run_with_env() {
       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"
+  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
@@ -257,7 +321,7 @@ __rvm_nuke_rvm_variables() {
 
 # Unset ruby-specific variables
 __rvm_unset_ruby_variables() {
-  unset rvm_head_flag $(env | awk -F= '/^rvm_ruby_/{printf $1" "}')
+  unset rvm_ruby_flag $(env | awk -F= '/^rvm_ruby_/{printf $1" "}')
 }
 
 # TODO: Should be able to...
@@ -268,40 +332,61 @@ __rvm_cleanse_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_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 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_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'
 __rvm_with_env() {
-  local environment_id="$1" command="$2"
-  ( rvm use "$environment_id" ; eval "$command" )
+  local environment_id command
+
+  environment_id="$1"
+  command="$2"
+
+  (
+  rvm use "$environment_id"
+  eval "$command"
+  )
 }
 
 # Returns the first 1.8.7-compatible (partly) ruby for use
 # with things like rbx etc which require a ruby be installed.
 __rvm_18_compat_ruby() {
-  local rubies=""
-  for ruby_name in $(\ls "$rvm_rubies_path"); do
-    if [[ ! -L "$rvm_rubies_path/$ruby_name" ]] && [[ "$ruby_name" =~ 1.8. || "$ruby_name" =~ rbx- || "$ruby_name" =~ ree- ]] ; then
-      rubies="$rubies $ruby_name"
+  local rubies ruby_name
+
+  rubies=($( cd "$rvm_rubies_path" ; find * -type d -maxdepth 0 ))
+
+  for ruby_name in "${rubies[@]}"; do
+
+    if [[ ! -L "$rvm_rubies_path/$ruby_name" ]] ; then
+
+      case $ruby_name in
+        *1.8.*|rbx-*|ree-*) rubies="$rubies $ruby_name" ;;
+      esac
     fi
-  done; unset ruby_name
+  done
 
-  echo "$rubies" | sed 's/^ //' | \tr ' ' '\n' | sort | tail -n1
+  echo $rubies | \tr ' ' '\n' | \sort | \tail -n1
 
   return 0
 }
 
 __rvm_ensure_has_18_compat_ruby() {
+
   if [[ -z "$(__rvm_18_compat_ruby)" ]]; then
     # TODO: install currently doesn't return the correct status.
     local compat_result=0
+
     if ! ( "$rvm_scripts_path/manage" install 1.8.7 ); then
-      "$rvm_scripts_path/log" "fail" "To proceed rvm requires a 1.8-compatible ruby is installed. We attempted to install 1.8.7 automatically but it failed."
-      "$rvm_scripts_path/log" "fail" "Please install it manually (or a compatible alternative) to proceed."
+
+      "$rvm_scripts_path/log" "fail" \
+        "To proceed rvm requires a 1.8-compatible ruby is installed. We attempted to install 1.8.7 automatically but it failed.\
+        Please install it manually (or a compatible alternative) to proceed."
+
       compat_result=1
-    fi ; unset original_ruby
-    # TODO: Why are we unsetting original_ruby here
+
+    fi
+    # unset original_ruby
+    # Question: Why *were* we unsetting original_ruby here
     return $compat_result
   fi
 
@@ -311,6 +396,7 @@ __rvm_ensure_has_18_compat_ruby() {
 # Cleans up temp folders for a given prefix,
 # typically the current process id.
 __rvm_cleanup_temp_for() {
+
   local prefix="$1"
 
   [[ -z "$prefix" ]] && return 1
@@ -524,8 +610,10 @@ __rvm_update_rvm() {
   (
     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
@@ -620,12 +708,12 @@ __rvm_inspect() {
 
     "$rvm_scripts_path/log" "info" "$actual_file:"
 
-    if [[ $rvm_shebang_flag -eq 1 ]] ; then head -n 1    < "$actual_file" ; fi
-    if [[ $rvm_env_flag -eq 1 ]]     ; then awk '/ENV/'  < "$actual_file" ; fi
-    if [[ $rvm_path_flag -eq 1 ]]    ; then awk '/PATH/' < "$actual_file" ; fi
-    if [[ $rvm_head_flag -eq 1 ]]    ; then head -n 5    < "$actual_file" ; fi
-    if [[ $rvm_tail_flag -eq 1 ]]    ; then tail -n 5    < "$actual_file" ; fi
-    if [[ $rvm_all_flag -eq 1 ]]     ; then cat $actual_file              ; fi
+    if [[ $rvm_shebang_flag -eq 1 ]] ; then \head -n 1    < "$actual_file" ; fi
+    if [[ $rvm_env_flag -eq 1 ]]     ; then \awk '/ENV/'  < "$actual_file" ; fi
+    if [[ $rvm_path_flag -eq 1 ]]    ; then \awk '/PATH/' < "$actual_file" ; fi
+    if [[ $rvm_head_flag -eq 1 ]]    ; then \head -n 5    < "$actual_file" ; fi
+    if [[ $rvm_tail_flag -eq 1 ]]    ; then \tail -n 5    < "$actual_file" ; fi
+    if [[ $rvm_all_flag -eq 1 ]]     ; then \cat $actual_file              ; fi
   done
 
   return 0
@@ -644,12 +732,12 @@ __rvm_make_flags() {
     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
-        rvm_ruby_configure_flags="${rvm_ruby_configure_flags} --build=x86_64-apple-darwin$(uname -r) --host=x86_64-apple-darwin$(uname -r)"
+        rvm_configure_flags="${rvm_configure_flags} --build=x86_64-apple-darwin$(uname -r) --host=x86_64-apple-darwin$(uname -r)"
       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)"
+        rvm_configure_flags="${rvm_configure_flags} --build=i386-apple-darwin$(uname -r) --host=i386-apple-darwin$(uname -r)"
       else
         rvm_archflags="-arch x86_64"
-        rvm_ruby_configure_flags="${rvm_ruby_configure_flags} --build=x86_64-apple-darwin$(uname -r) --host=x86_64-apple-darwin$(uname -r)"
+        rvm_configure_flags="${rvm_configure_flags} --build=x86_64-apple-darwin$(uname -r) --host=x86_64-apple-darwin$(uname -r)"
       fi
     fi
 
@@ -657,7 +745,7 @@ __rvm_make_flags() {
       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)"
+        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
@@ -883,7 +971,11 @@ __rvm_check_rvmrc_trustworthiness() {
 }
 
 __rvm_ask_to_trust() {
+
+  local trusted value
+
   [[ -n "$rvm_promptless" ]] && return 2
+
   printf "
   ============================================================
   RVM has encountered a not yet trusted .rvmrc file in the
@@ -899,22 +991,30 @@ $(cat $1)
   Do you wish to trust this .rvmrc from now on?
   ============================================================
   (y for yes, n for no)"
-  local trusted=""
+
   # TODO: Eliminate infinite loop possibility.
   while [[ -z "$trusted" ]] ; do
+
     printf " > "
+
     read -r response
+
     value="$(echo "$response" | tr '[[:upper:]]' '[[:lower:]]' | __rvm_strip)"
+
     if [[ "$response" = "y"* ]]; then
       trusted=1
+
     elif [[ "$response" = "n"* ]]; then
       trusted=0
     fi
-  done ; unset value
+  done
+
+  if [[ ${trusted:-0} -gt 0 ]] ; then
 
-  if [[ "$trusted" == "1" ]] ; then
     __rvm_trust_rvmrc "$1"
+
     return 0
+
   else
     __rvm_untrust_rvmrc "$1"
     return 1
@@ -930,17 +1030,27 @@ __rvm_project_rvmrc() {
   cwd="${1:-"$PWD"}"
 
   while : ; do
+
     if [[ -z "$cwd" || "$HOME" = "$cwd" || "/" = "$cwd" ]] ; 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
+
           __rvm_load_env_file "$rvm_previous_environment"
+
         fi
+
         unset rvm_rvmrc_cwd rvm_previous_environment
+
       fi
       break
     else
+
       if [[ -f "$cwd/.rvmrc" ]] ; then
 
         if [[ "${rvm_rvmrc_cwd:-""}" != "$cwd" ]] ; then
@@ -950,54 +1060,89 @@ __rvm_project_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
 
+            return 0
           else
             return "$rvm_trustworthiness_result"
           fi
         fi
         break
+
       else
         cwd="$(dirname "$cwd")"
       fi
     fi
   done
+
   return $?
 }
 
 __rvm_record_install() {
+
+  local recorded_ruby_name rvm_install_record_file rvm_install_command
+
   [[ -z "$1" ]] && return
-  local recorded_ruby_name="$($rvm_scripts_path/tools strings "$1")"
-  local rvm_install_record_file="$rvm_config_path/installs"
-  local rvm_install_command="$(echo "$recorded_ruby_name $rvm_install_arguments" | __rvm_strip)"
+
+  recorded_ruby_name="$($rvm_scripts_path/tools strings "$1")"
+
+  rvm_install_record_file="$rvm_config_path/installs"
+
+  rvm_install_command="$(echo "$recorded_ruby_name $rvm_install_arguments" | __rvm_strip)"
+
   \touch "$rvm_install_record_file"
+
   \rm -f "$rvm_install_record_file.tmp"
+
   \grep -v "^$recorded_ruby_name " < "$rvm_install_record_file" > "$rvm_install_record_file.tmp"
+
   echo "$rvm_install_command" >> "$rvm_install_record_file.tmp"
+
   \rm -f "$rvm_install_record_file"
+
   \mv "$rvm_install_record_file.tmp" "$rvm_install_record_file"
+
+  return 0
 }
 
 __rvm_remove_install_record() {
-  local recorded_ruby_name="$($rvm_scripts_path/tools strings "$1")"
-  local rvm_install_record_file="$rvm_config_path/installs"
+  local recorded_ruby_name rvm_install_record_file
+
+  recorded_ruby_name="$($rvm_scripts_path/tools strings "$1")"
+
+  rvm_install_record_file="$rvm_config_path/installs"
+
   if [[ -s "$rvm_install_record_file" ]]; then
+
     \mv "$rvm_install_record_file" "$rvm_install_record_file.tmp"
+
     \grep -v "^$recorded_ruby_name " < "$rvm_install_record_file.tmp" > "$rvm_install_record_file"
+
     \rm -f "$rvm_install_record_file.tmp"
   fi
+
   return 0
 }
 
 __rvm_recorded_install_command() {
-  local recorded_ruby_name="$($rvm_scripts_path/tools strings "$1" | awk -F"$rvm_gemset_separator" '{print $1}')"
+
+  local recorded_ruby_name recorded_ruby_match
+
+  recorded_ruby_name="$($rvm_scripts_path/tools strings "$1" | awk -F"$rvm_gemset_separator" '{print $1}')"
+
   [[ -z "$recorded_ruby_name" ]] && return 1
-  local recorded_ruby_match="^$recorded_ruby_name "
+
+  recorded_ruby_match="^$recorded_ruby_name "
+
   if [[ -s "$rvm_config_path/installs" ]] && \grep -q "$recorded_ruby_match" "$rvm_config_path/installs" ; then
+
     \grep "$recorded_ruby_match" < "$rvm_config_path/installs" | head -n1
+
   else
     return 1
   fi
@@ -1005,41 +1150,47 @@ __rvm_recorded_install_command() {
 }
 
 __rvm_environment_identifier() {
-  local path
-  local string
+
+  local path string
+
   path="${GEM_HOME:-""}"
+
   string="${path//*gems\//}"
   string="${string//\/*/}"
+
   echo "${string:-system}"
+
   return $?
 }
 
 __rvm_expand_ruby_string() {
+
   local string="$1"
 
   if [[ -z "$string" || "$string" = "all" ]]; then
-    "$rvm_scripts_path/list" strings | tr ' ' "\n" | __rvm_strip
+    "$rvm_scripts_path/list" strings | tr ' ' "\n"
 
   elif [[ "$string" = "all-gemsets" ]]; then
-    "$rvm_scripts_path/list" gemsets strings | __rvm_strip
+    "$rvm_scripts_path/list" gemsets strings
 
   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
+    "$rvm_scripts_path/list" rubies strings
 
   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
+    rvm_silence_logging=1 "$rvm_scripts_path/gemsets" list | sed "s/^/$current_ruby$rvm_gemset_separator/"
 
   elif [[ "$string" = "current" ]]; then
     __rvm_environment_identifier
 
   elif [[ "$string" = "aliases" ]]; then
-    awk -F= '{print $string}' < "$rvm_config_path/alias" | __rvm_strip
+    awk -F= '{print $string}' < "$rvm_config_path/alias"
 
   else
+
     echo "$string" | tr "," "\n" | __rvm_strip
   fi
   return $?