rvm 1.0.1 → 1.0.2

data/scripts/tools

@@ -17,15 +17,13 @@ tools_path_identifier() {
     echo "Usage: rvm tools path-identifier 'path-to-heck'"
     return 1
   fi
-  # Change to the directory. Do in subshell to keep the env correct.
-  (
-    source "$rvm_scripts_path/rvm"
-    builtin cd "$1"
-    rvm_promptless=1 __rvm_project_rvmrc
-    rvmrc_result="$?"
-    __rvm_environment_identifier
-    exit $rvmrc_result
-  )
+
+  source "$rvm_scripts_path/rvm"
+  builtin cd "$1"
+  rvm_promptless=1 __rvm_project_rvmrc
+  rvmrc_result="$?"
+  __rvm_environment_identifier
+  exit $rvmrc_result
 }
 
 tools_strings() {

data/scripts/update

@@ -76,7 +76,7 @@ if [[ -z "$rvm_path" ]] ; then rvm_path="${rvm_prefix}rvm" ; fi
 
 source scripts/initialize
 
-if \grep -q 'scripts/rvm' $HOME/.bash* 2>/dev/null || \grep -q 'scripts/rvm' $HOME/.zsh* 2>/dev/null; then
+if \grep -q 'scripts/rvm' "$HOME"/.bash* 2>/dev/null || \grep -q 'scripts/rvm' "$HOME"/.zsh* 2>/dev/null; then
   if [[ -d "$rvm_path" ]] && [[ -s "${rvm_path}/scripts/rvm" ]] ; then
     export upgrade_flag=1
   else
@@ -93,7 +93,7 @@ __rvm_initialize
 #
 item="$(tput setaf 2)* $(tput sgr0)"
 question="\n$(tput setaf 2)<?>$(tput sgr0)"
-cwd=$PWD
+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"}"
@@ -151,7 +151,7 @@ done ; unset dir_name
 spinner
 if [[ ! -s "$rvm_config_path/user" ]] ; then
   \mkdir -p "$rvm_config_path/"
-  echo '# Users settings file, overrides db file settings and persists across installs.' >> $rvm_config_path/user
+  echo '# Users settings file, overrides db file settings and persists across installs.' >> "$rvm_config_path/user"
 fi
 
 scripts=("monitor" "match" "log" "install" "color" "db" "fetch" "log" "set" "package")
@@ -170,7 +170,7 @@ for file in rvm-prompt rvm rvmsudo rvm-shell rvm-auto-ruby ; do
   \cp -f "$source_path/binscripts/$file" $rvm_bin_path/
 done
 spinner
-chmod +x $rvm_bin_path/*
+chmod +x "$rvm_bin_path"/*
 
 #
 # RC Files
@@ -179,17 +179,17 @@ spinner
 if [[ -n "$rvm_auto_flag" ]] ; then
   printf "Checking rc files... ($rvm_rc_files)"
   if [[ "$rvm_loaded_flag" != "1" ]] ; then
-    for rcfile in $(echo $rvm_rc_files) ; do
+    for rcfile in $(printf $rvm_rc_files) ; do
       if [[ ! -f $rcfile ]] ; then \touch $rcfile ; fi
       if [[ -s "$HOME/.profile" ]] ; then
         if ! \grep -q '.profile' "$rcfile" ; then
           echo "    Adding 'if [[ -s \$HOME/.profile ]] ; then source \$HOME ; fi' to $rcfile."
-          printf "\n# rvm-install added line:\nif [[ -s \$HOME/.profile ]] ; then source \$HOME/.profile ; fi\n" >> $rcfile
+          printf "\n# rvm-install added line:\nif [[ -s \$HOME/.profile ]] ; then source \$HOME/.profile ; fi\n" >> "$rcfile"
         fi
       fi
       if ! \grep -q "scripts\/rvm" "$rcfile" ; then
         echo "    Adding 'if [[ -s $rvm_scripts_path/rvm ]] ; then source $rvm_scripts_path/rvm ; fi' to $rcfile."
-        printf "\n# rvm-install added:\nif [[ -s $rvm_scripts_path/rvm ]] ; then source $rvm_scripts_path/rvm ; fi\n" >> $rcfile
+        printf "\n# rvm-install added:\nif [[ -s $rvm_scripts_path/rvm ]] ; then source $rvm_scripts_path/rvm ; fi\n" >> "$rcfile"
       fi
     done
   fi
@@ -254,26 +254,27 @@ done
 spinner
 printf "\r*" # Stop spinner.
 
-for gemset in $rvm_path/gems/*\%* ; do
+for gemset in "$rvm_path"/gems/*\%* ; do
   new_path=${gemset/\%/${rvm_gemset_separator}}
   if [[ -d "$gemset" ]] && [[ ! -d "$new_path" ]] ; then
-    printf "\n    Renaming $(basename $gemset) to $(basename $new_path) for new gemset separator."
-    mv $gemset $new_path
+    printf "\n    Renaming $(basename "$gemset") to $(basename "$new_path") for new gemset separator."
+    mv "$gemset" "$new_path"
   fi
 done
 
-for gemset in $rvm_path/gems/*\+* ; do
+for gemset in "$rvm_path"/gems/*\+* ; do
   new_path=${gemset/\+/${rvm_gemset_separator}}
   if [[ -d "$gemset" ]] && [[ ! -d "$new_path" ]] ; then
-    printf "\n    Renaming $(basename $gemset) to $(basename $new_path) for new gemset separator."
+    printf "\n    Renaming $(basename "$gemset") to $(basename "$new_path") for new gemset separator."
     mv $gemset $new_path
   fi
 done
-for gemset in $rvm_path/gems/*\@ ; do
+
+for gemset in "$rvm_path"/gems/*\@ ; do
   new_path=$(echo $gemset | sed -e 's#\@$##')
   if [[ -d "$gemset" ]] && [[ ! -d "$new_path" ]] ; then
-    printf "\n    Fixing: $(basename $gemset) to $(basename $new_path) for new gemset separator."
-    mv $gemset $new_path
+    printf "\n    Fixing: $(basename "$gemset") to $(basename "$new_path") for new gemset separator."
+    mv "$gemset" "$new_path"
   fi
 done
 
@@ -281,18 +282,16 @@ done
 if [[ -s "$rvm_config_path/default" ]]; then
   original_version="$(basename "$(\grep GEM_HOME "$rvm_config_path/default" | awk -F"'" '{print $2}' | sed "s#\%#${rvm_gemset_separator}#")")"
   if [[ -n "$original_version" ]]; then
-    $rvm_scripts_path/alias create default "$original_version" &> /dev/null
-  fi
-  unset original_version
+    "$rvm_scripts_path/alias" create default "$original_version" &> /dev/null
+  fi ; unset original_version
   \rm -rf "$rvm_config_path/default"
 fi
 
 #
 # End of gemset migration.
 #
-
 printf "\n    Correct permissions for base binaries in $rvm_bin_path..."
-\mkdir -p $rvm_bin_path
+\mkdir -p "$rvm_bin_path"
 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

data/scripts/upgrade

@@ -17,12 +17,12 @@ confirm() {
 }
 
 die_with_error() {
-  $rvm_scripts_path/log "fail" "$1"
+  "$rvm_scripts_path/log" "fail" "$1"
   exit "${2:-1}"
 }
 
 expand_ruby_name() {
-  $rvm_scripts_path/tools strings "$1" | awk -F"$rvm_gemset_separator" '{print $1}'
+  "$rvm_scripts_path/tools" strings "$1" | awk -F"$rvm_gemset_separator" '{print $1}'
 }
 
 expand_existing_ruby() {
@@ -33,7 +33,7 @@ expand_existing_ruby() {
       echo "$ruby_name"
       return 0
     fi
-  done < <($rvm_scripts_path/list strings | tr ' ' '\n'  | sort -ur | \grep "^$prefix" | \grep -v '-head$' | head -n1)
+  done < <("$rvm_scripts_path/list" strings | tr ' ' '\n'  | sort -ur | \grep "^$prefix" | \grep -v '-head$' | head -n1)
   return 1
 }
 
@@ -46,18 +46,18 @@ upgrade_ruby() {
   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/migrate "$expanded_source" "$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"
 
-  $rvm_scripts_path/log "info" "Upgrade complete!"
+  "$rvm_scripts_path/log" "info" "Upgrade complete!"
 }
 
 [[ -z "$1" ]] && usage

data/scripts/utility

@@ -42,17 +42,17 @@ __rvm_teardown() {
 }
 
 __rvm_dump_environment() {
-  local dump_environment_file="$(echo "$rvm_dump_environment_flag" | awk -F, '{print $1}')"
-  local dump_environment_type="$(echo "$rvm_dump_environment_flag" | awk -F, '{print $2}')"
+  # Note: This assumes that there is a ','
+  local dump_environment_file="${rvm_dump_environment_flag/,*/}"
+  local dump_environment_type="${rvm_dump_environment_flag/*,/}"
   if [[ -n "$dump_environment_file" && -n "$dump_environment_type" ]]; then
     if [[ "$dump_environment_type" == "atheis"* ]]; then
       \rm -rf "$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"
+      "$rvm_scripts_path/environment-convertor" "$dump_environment_type" "$(__rvm_environment_identifier)" > "$dump_environment_file"
       [[ "$?" -gt 0 ]] && \rm -rf "$dump_environment_file"
     fi
-  fi
-  unset rvm_dump_environment_flag
+  fi ; unset rvm_dump_environment_flag
 }
 
 # Return a list of directories under a given base path.
@@ -113,7 +113,7 @@ __rvm_quote_args_with_shift() {
 
 __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."
+    "$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
@@ -148,20 +148,20 @@ __rvm_set_path_variable() {
   if [[ -d "$1" ]] ; then
     eval "${path_variable}=${1}"
   else
-    $rvm_scripts_path/log "error" "'$1' is not a valid path."
+    "$rvm_scripts_path/log" "error" "'$1' is not a valid path."
   fi ; unset path_variable
 }
 
 # 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#:$##')
+  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" | \tr -s '\n' ':' | sed 's#:$##')
+  PATH="$(echo $PATH | \tr -s ':' '\n' | \grep -v "$rvm_path" | \tr -s '\n' ':' | sed 's#:$##')"
   export PATH
   builtin hash -r
 }
@@ -170,9 +170,9 @@ __rvm_remove_rvm_from_path() {
 __rvm_run() {
   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
+  if [[ -n "$message" ]] ; then "$rvm_scripts_path/log" "info" "$message" ; fi
   if [[ -n "$rvm_debug_flag" ]] ; then
-    $rvm_scripts_path/log "debug" "Executing: $command"
+    "$rvm_scripts_path/log" "debug" "Executing: $command"
   fi
 
   \mkdir -p "$(dirname "$rvm_ruby_log_path/$log_file_name.log")"
@@ -183,7 +183,7 @@ __rvm_run() {
   else
     eval "nice -n $rvm_niceness $command" >> $rvm_ruby_log_path/$log_file_name.log 2>> $rvm_ruby_log_path/$log_file_name.error.log
   fi
-  if [[ $? -gt 0 ]] ; then $rvm_scripts_path/log "error" "Error running '$command', please check $rvm_ruby_log_path/$log_file_name*.log" ; __rvm_pushpop ; return 1 ; fi
+  if [[ $? -gt 0 ]] ; then "$rvm_scripts_path/log" "error" "Error running '$command', please check $rvm_ruby_log_path/$log_file_name*.log" ; __rvm_pushpop ; return 1 ; fi
   unset log_file command
 }
 
@@ -192,9 +192,9 @@ __rvm_run_with_env() {
   log_file_name="$1" ; env_name="$2" ; command="$3" ; message="$4"
   if [[ -z "$env_name" ]]; then env_name="$(__rvm_environment_identifier)"; fi
   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 "$message" ]] ; then "$rvm_scripts_path/log" "info" "$message" ; fi
   if [[ -n "$rvm_debug_flag" ]] ; then
-    $rvm_scripts_path/log "debug" "Executing: $command in environment "$env_name""
+    "$rvm_scripts_path/log" "debug" "Executing: $command in environment "$env_name""
   fi
 
   \mkdir -p "$(dirname "$rvm_ruby_log_path/$log_file_name.log")"
@@ -205,13 +205,13 @@ __rvm_run_with_env() {
   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
-  if [[ $? -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 ; return 1 ; fi
+  if [[ $? -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 ; return 1 ; fi
   unset log_file command env_name
 }
 
 # 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_cleanup_variables() {
+__rvm_cleanse_variables() {
   __rvm_unset_ruby_variables
 
   if [[ "$rvm_sticky_flag" = "1" ]] ; then export rvm_gemset_name ; else unset rvm_gemset_name  ; fi
@@ -230,8 +230,8 @@ __rvm_with_env() {
   rvm_env_command="$(echo "$2" | sed "s/rvm /rvm $rvm_env_args /")"
   # Subshells!
   (
-    source $rvm_scripts_path/rvm
-    rvm $rvm_env_args use $1 && eval "$rvm_env_command"
+    source "$rvm_scripts_path/rvm"
+    rvm "$rvm_env_args" use $1 && eval "$rvm_env_command"
   )
   unset rvm_env_args rvm_env_command
 }
@@ -240,8 +240,8 @@ __rvm_with_env() {
 # with things like rbx etc which require a ruby be installed.
 __rvm_18_compat_ruby() {
   rubies=""
-  for ruby_name in $(\ls $rvm_rubies_path); do
-    if [[ ! -L "$rvm_rubies_path/$ruby_name" ]] && $rvm_scripts_path/match "$ruby_name" '^(ruby-1.8.[[:digit:]]|rbx|ree)-'; then
+  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"
     fi
   done; unset ruby_name
@@ -253,20 +253,18 @@ __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."
+    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."
       compat_result=1
-    fi
-    unset original_ruby
+    fi ; unset original_ruby
     return $compat_result
   fi
 }
 
 __rvm_inherit_trace_flag() {
   if [[ -n "$rvm_trace_flag" ]]; then
-    set -x
-    export rvm_trace_flag
+    set -x ; export rvm_trace_flag
   fi
 }
 
@@ -276,8 +274,7 @@ __rvm_cleanup_temp_for() {
   [[ -z "$1" ]] && return 1
   if [[ -d "$rvm_tmp_path/" ]]; then
     \rm -rf "$rvm_tmp_path/$1"* >/dev/null 2>&1
-  fi
-  exit
+  fi ; exit
 }
 
 __rvm_cleanup_temp_on_exit() {
@@ -290,7 +287,7 @@ __rvm_set_rvmrc() {
 
     if [[ -s .rvmrc ]] ; then
       mv .rvmrc .rvmrc.$(date +%m.%d.%Y-%H:%M:%S)
-      $rvm_scripts_path/log "warning" ".rvmrc is not empty, moving aside to preserve."
+      "$rvm_scripts_path/log" "warning" ".rvmrc is not empty, moving aside to preserve."
     fi
 
     local identifier=$(__rvm_environment_identifier)
@@ -299,16 +296,15 @@ __rvm_set_rvmrc() {
 
     unset flags
   else
-    $rvm_scripts_path/log "error" ".rvmrc cannot be set in your home directory. \n The home .rvmrc is for global rvm settings only."
+    "$rvm_scripts_path/log" "error" ".rvmrc cannot be set in your home directory. \n The home .rvmrc is for global rvm settings only."
   fi
-
 }
 __rvm_load_rvmrc() {
   [[ -z "$rvm_ignore_rvmrc" ]] && return
   for rvmrc in /etc/rvmrc $HOME/.rvmrc ; do
     if [[ -f "$rvmrc" ]] ; then
       if \grep -q '^\s*rvm .*$' $rvmrc ; then
-        $rvm_scripts_path/log "error" "$rvmrc is for rvm settings only.\nrvm CLI may NOT be called from within $rvmrc. \nSkipping the loading of $rvmrc"
+        "$rvm_scripts_path/log" "error" "$rvmrc is for rvm settings only.\nrvm CLI may NOT be called from within $rvmrc. \nSkipping the loading of $rvmrc"
         return 1
       else
         source "$rvmrc"
@@ -332,7 +328,7 @@ __rvm_benchmark() {
   old_rvm_ruby_string=$rvm_ruby_string
   unset rvm_ruby_string
   export rvm_ruby_strings
-  $rvm_scripts_path/set $rvm_action $rvm_ruby_args
+  "$rvm_scripts_path/set" "$rvm_action" $rvm_ruby_args
   result=$?
   # Restore the state pre-sets.
   [[ -n "$old_rvm_ruby_string" ]] && rvm_ruby_string=$old_rvm_ruby_string
@@ -341,25 +337,25 @@ __rvm_benchmark() {
 
 # Loop over the currently installed rubies and refresh their binscripts.
 __rvm_bin_scripts() {
-  for rvm_ruby_binary in $rvm_rubies_path/*/bin/ruby ; do
-  if [[ -x "$rvm_ruby_binary" ]] ; then
-    rvm_ruby_string=$(dirname "$rvm_ruby_binary" | xargs dirname | xargs basename)
-    __rvm_select
-    __rvm_bin_script
-  fi
+  for rvm_ruby_binary in "$rvm_rubies_path"/*/bin/ruby ; do
+    if [[ -x "$rvm_ruby_binary" ]] ; then
+      rvm_ruby_string=$(dirname "$rvm_ruby_binary" | xargs dirname | xargs basename)
+      __rvm_select
+      __rvm_bin_script
+    fi
   done
 }
 
 # Write the bin/ wrapper script for currently selected ruby.
 # TODO: Adjust binscript to be able to handle all rubies not just the standard interpreteres.
 __rvm_bin_script() {
-  $rvm_scripts_path/wrapper "$rvm_ruby_string"
+  "$rvm_scripts_path/wrapper" "$rvm_ruby_string"
 }
 
 # Add bin path if not present
 __rvm_conditionally_add_bin_path() {
-  if echo "$PATH" | \tr ':' ' ' | \grep -vqF "$rvm_bin_path " ; then
-    PATH="$rvm_bin_path:$PATH"
+  if echo "${PATH//:/ }" | \grep -vqF "$rvm_bin_path " ; then
+    PATH="${rvm_bin_path}:$PATH"
     builtin hash -r
   fi
 }
@@ -386,7 +382,7 @@ __rvm_reset() {
   __rvm_unset_ruby_variables
 
   for system_config in system_ruby system_gem_path system_user_gem_path ; do
-    $rvm_scripts_path/db "$rvm_config_path/user" "$system_config" "delete"
+    "$rvm_scripts_path/db" "$rvm_config_path/user" "$system_config" "delete"
   done ; unset system_config variable
 
   \rm -f $rvm_bin_path/ruby $rvm_bin_path/gem $rvm_bin_path/rake $rvm_bin_path/irb $rvm_bin_path/default*
@@ -395,23 +391,23 @@ __rvm_reset() {
 # Implode removes the entire rvm installation under $rvm_path.
 __rvm_implode() {
   while : ; do
-    $rvm_scripts_path/log "warn" "Are you SURE you wish for rvm to implode? This will remove $rvm_path ? (type 'yes' or 'no')"
+    "$rvm_scripts_path/log" "warn" "Are you SURE you wish for rvm to implode? This will remove $rvm_path ? (type 'yes' or 'no')"
     read response
     if [[ "yes" = "$response" ]] ; then
       if [[ "/" = "$rvm_path" ]] ; then
-        $rvm_scripts_path/log "error" "remove '/' ?!... NO!"
+        "$rvm_scripts_path/log" "error" "remove '/' ?!... Ni!"
       else
         if [[ -d "$rvm_path" ]] ; then
-          $rvm_scripts_path/log "info" "Hai! Removing $rvm_path"
-          \rm -rf $rvm_path/
+          "$rvm_scripts_path/log" "info" "Hai! Removing $rvm_path"
+          \rm -rf "$rvm_path/"
           echo "$rvm_path has been removed."
         else
-          $rvm_scripts_path/log "info" "It appears that $rvm_path is already non existant."
+          "$rvm_scripts_path/log" "info" "It appears that $rvm_path is already non existant."
         fi
       fi
       break
     elif [[ "no" = "$response" ]] ; then
-      $rvm_scripts_path/log "info" "Cancelling implosion, no harm done :)"
+      "$rvm_scripts_path/log" "info" "Cancelling implosion, no harm done :)"
       break
     fi
   done
@@ -421,7 +417,7 @@ __rvm_implode() {
 __rvm_source_dir() {
   if [[ -z "$rvm_ruby_selected_flag" ]] ; then __rvm_select ; fi
   if [[ -z "$rvm_ruby_src_path" ]] ; then
-    $rvm_scripts_path/log "fail" "No source directory exists for the default implementation."
+    "$rvm_scripts_path/log" "fail" "No source directory exists for the default implementation."
   else
     echo "$rvm_ruby_src_path"
   fi
@@ -449,7 +445,7 @@ __rvm_update() {
   fi
   [[ -n "$rvm_bin_flag" ]] && __rvm_bin_scripts
   # Update to the latest rubygems.
-  [[ -n "$rvm_rubygems_flag" ]] && $rvm_scripts_path/rubygems current
+  [[ -n "$rvm_rubygems_flag" ]] && "$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
@@ -472,7 +468,7 @@ __rvm_update_rvm() {
 
     __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
@@ -482,14 +478,14 @@ __rvm_update_rvm() {
 }
 
 __rvm_reboot() {
-  $rvm_scripts_path/log "warn" "Do you wish to reboot rvm? ('yes', or 'no')"
+  "$rvm_scripts_path/log" "warn" "Do you wish to reboot rvm? ('yes', or 'no')"
   read response
   if [[ "yes" = "$response" ]] ; then
     builtin cd $rvm_path
     __rvm_reset
-    mv $rvm_path/archives ~/.archives
+    mv "$rvm_path/archives" "$HOME/.archives"
     if [[ "/" = "$rvm_path" ]] ; then
-      $rvm_scripts_path/log "error" "remove '/' ?!... NO!"
+      "$rvm_scripts_path/log" "error" "remove '/' ?!... NO!"
     else
       if [[ -d "$rvm_path" ]] ; then \rm -rf "$rvm_path/" ; fi
     fi
@@ -497,14 +493,14 @@ __rvm_reboot() {
     __rvm_update_rvm
     source $rvm_path/scripts/rvm
   else
-    $rvm_scripts_path/log "info" "Carry on then..."
+    "$rvm_scripts_path/log" "info" "Carry on then..."
   fi ; unset response
 }
 
 # Create the irbrc for the currently selected ruby installation.
 __rvm_irbrc() {
   if [[ -d "$rvm_ruby_home" ]] && [[ ! -s "$rvm_ruby_irbrc" ]] ; then
-    \cp $rvm_scripts_path/irbrc $rvm_ruby_irbrc
+    \cp "$rvm_scripts_path/irbrc" "$rvm_ruby_irbrc"
   fi
 }
 
@@ -540,7 +536,7 @@ __rvm_state() {
 __rvm_inspect() {
   for binary in $rvm_ruby_args ; do
     actual_file="$(command -v $binary)"
-    $rvm_scripts_path/log "info" "$actual_file:"
+    "$rvm_scripts_path/log" "info" "$actual_file:"
     if [[ -n "$rvm_shebang_flag" ]] ; then head -n 1    < "$actual_file" ; fi
     if [[ -n "$rvm_env_flag" ]]     ; then awk '/ENV/'  < "$actual_file" ; fi
     if [[ -n "$rvm_path_flag" ]]    ; then awk '/PATH/' < "$actual_file" ; fi
@@ -600,18 +596,18 @@ __rvm_become() {
 
 __rvm_ensure_has_environment_files() {
   local environment_identifier="$(__rvm_environment_identifier)"
-  file_name="${rvm_environments_path}/$environment_identifier"
+  local file_name="${rvm_environments_path}/$environment_identifier"
 
   if [[ ! -s "$file_name" ]] ; then
     \mkdir -p "${rvm_environments_path}"
-    echo "export PATH=\"${rvm_ruby_gem_home}/bin:${rvm_ruby_global_gems_path}/bin:${rvm_ruby_home}/bin:${rvm_bin_path}:\$PATH\"" > $file_name
+    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 "value=\$${variable}"
       if [[ -n "$value" ]] ; then
-        printf "${variable}='$value'\nexport ${variable}\n" >> $file_name
+        printf "${variable}='$value'\nexport ${variable}\n" >> "$file_name"
       else
-        printf "unset ${variable}\n" >> $file_name
+        printf "unset ${variable}\n" >> "$file_name"
       fi
     done ; unset variable value
   fi ; unset file_name
@@ -624,7 +620,7 @@ __rvm_ensure_has_environment_files() {
     directory_name="$rvm_wrappers_path/$wrapper_identifier"
     if [[ ! -L "$directory_name" && ! -d "$directory_name" ]]; then
       \mkdir -p "$directory_name"
-      $rvm_scripts_path/wrapper "$wrapper_identifier" &> /dev/null
+      "$rvm_scripts_path/wrapper" "$wrapper_identifier" &> /dev/null
     fi
     unset rvm_creating_default_wrappers directory_name
     done; unset wrapper_identifier
@@ -637,7 +633,7 @@ __rvm_strip() {
 }
 
 __rvm_using_gemset_globalcache() {
-  $rvm_scripts_path/db "$rvm_config_path/user" "use_gemset_globalcache" | \grep -q '^true$'
+  "$rvm_scripts_path/db" "$rvm_config_path/user" "use_gemset_globalcache" | \grep -q '^true$'
 }
 
 __rvm_current_gemcache_dir() {
@@ -656,7 +652,7 @@ __rvm_ultimate_question() {
   printf "\nI do not know the Ultimate Question, "
   printf "\nhowever I can help you build a more "
   printf "\npowerful Ruby which can compute the "
-  printf "\nUltimate Question."
+  printf "\nUltimate Question.\n"
 }
 
 __rvm_load_env_file() {
@@ -684,24 +680,24 @@ __rvm_rvmrc_key() {
 
 __rvm_reset_rvmrc_trust() {
   touch "$rvm_config_path/rvmrcs"
-  $rvm_scripts_path/db "$rvm_config_path/rvmrcs" "$(__rvm_rvmrc_key "$1")" "delete" >/dev/null 2>&1
+  "$rvm_scripts_path/db" "$rvm_config_path/rvmrcs" "$(__rvm_rvmrc_key "$1")" "delete" >/dev/null 2>&1
 }
 
 __rvm_trust_rvmrc() {
   touch "$rvm_config_path/rvmrcs"
   __rvm_reset_rvmrc_trust "$1"
-  $rvm_scripts_path/db "$rvm_config_path/rvmrcs" "$(__rvm_rvmrc_key "$1")" "1" >/dev/null 2>&1
+  "$rvm_scripts_path/db" "$rvm_config_path/rvmrcs" "$(__rvm_rvmrc_key "$1")" "1" >/dev/null 2>&1
 }
 
 __rvm_untrust_rvmrc() {
   touch "$rvm_config_path/rvmrcs"
   __rvm_reset_rvmrc_trust "$1"
-  $rvm_scripts_path/db "$rvm_config_path/rvmrcs" "$(__rvm_rvmrc_key "$1")" "0" >/dev/null 2>&1
+  "$rvm_scripts_path/db" "$rvm_config_path/rvmrcs" "$(__rvm_rvmrc_key "$1")" "0" >/dev/null 2>&1
 }
 
 __rvm_rvmrc_stored_trust() {
   touch "$rvm_config_path/rvmrcs"
-  $rvm_scripts_path/db "$rvm_config_path/rvmrcs" "$(__rvm_rvmrc_key "$1")"
+  "$rvm_scripts_path/db" "$rvm_config_path/rvmrcs" "$(__rvm_rvmrc_key "$1")"
 }
 
 __rvm_rvmrc_tools() {
@@ -754,26 +750,33 @@ __rvm_check_rvmrc_trustworthiness() {
 
 __rvm_ask_to_trust() {
   [[ -n "$rvm_promptless" ]] && return 2
-  echo "Changing into a directory with an untrusted .rvmrc"
-  echo "Do you wish to trust the rvmrc in this directory? It contains:"
-  echo "---"
-  echo ""
-  cat "$1"
-  echo ""
-  echo "---"
-  echo "So, do you wish to trust it? (y for yes, n for no)"
+  printf "
+  ============================================================
+  RVM has encountered a new untrusted .rvmrc file containing:
+  ============================================================
+
+$(cat $1)
+
+  ============================================================
+  Trusting an .rvmrc file means that whenever you cd into the
+  directory RVM will excecute this .rvmrc script in your shell
+
+  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 value
-    value="$(echo "$value" | tr '[[:upper:]]' '[[:lower:]]' | __rvm_strip)"
-    if [[ "$value" = "y"* ]]; then
+    printf " > "
+    read -r response
+    value="$(echo "$response" | tr '[[:upper:]]' '[[:lower:]]' | __rvm_strip)"
+    if [[ "$response" = "y"* ]]; then
       trusted=1
-    elif [[ "$value" = "n"* ]]; then
+    elif [[ "$response" = "n"* ]]; then
       trusted=0
     fi
-  done
-  unset value
+  done ; unset value
+
   if [[ "$trusted" == "1" ]] ; then
     __rvm_trust_rvmrc "$1"
     return 0
@@ -857,26 +860,26 @@ __rvm_recorded_install_command() {
 
 __rvm_environment_identifier() {
   ruby_string="$(command -v ruby)"
+
   if [ -n "$ruby_string" ] && echo "$ruby_string" | \grep -q -F "$rvm_rubies_path"; then
     echo "$GEM_HOME" | xargs basename
   else
     echo "system"
-  fi
-  unset ruby_string
+  fi ; unset ruby_string
 }
 
 __rvm_expand_ruby_string() {
   if [[ -z "$1" || "$1" = "all" ]]; then
-    $rvm_scripts_path/list strings | tr ' ' "\n" | __rvm_strip
+    "$rvm_scripts_path/list" strings | tr ' ' "\n" | __rvm_strip
   elif [[ "$1" = "all-gemsets" ]]; then
-    $rvm_scripts_path/list gemsets strings | __rvm_strip
+    "$rvm_scripts_path/list" gemsets strings | __rvm_strip
   elif [[ "$1" = "default-with-rvmrc" || "$1" = "rvmrc" ]]; then
-    $rvm_scripts_path/tools path-identifier "$PWD"
+    "$rvm_scripts_path/tools" path-identifier "$PWD"
   elif [[ "$1" == "all-rubies" || "$1" = "rubies" ]]; then
-    $rvm_scripts_path/list rubies strings | __rvm_strip
+    "$rvm_scripts_path/list" rubies strings | __rvm_strip
   elif [[ "$1" == "current-ruby" || "$1" = "gemsets" ]]; then
     local current_ruby="$(__rvm_environment_identifier | awk -F"$rvm_gemset_separator" '{print $1}')"
-    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/"  | __rvm_strip
   elif [[ "$1" = "current" ]]; then
     __rvm_environment_identifier
   elif [[ "$1" = "aliases" ]]; then