rvm 1.0.0 → 1.0.1

data/scripts/override_gem

@@ -0,0 +1,10 @@
+#!/usr/bin/env bash
+
+if [[ -z "$rvm_leave_gem_alone" ]]; then
+  gem() {
+    command gem "$@"
+    local gem_result="$?"
+    hash -r
+    return $gem_result
+  }
+fi

data/scripts/repair

@@ -11,7 +11,7 @@ usage() {
 # related to wrappers.
 repair_symlinks() {
   __rvm_pushpop "$rvm_bin_path"
-  for executable_name in $(\find . -type l); do
+  for executable_name in $(\find \. -type l); do
     [[ -e "$executable_name" || "$(readlink "$executable_name")" != "$rvm_wrappers_path/"* ]] && continue
     if [[ -f "$executable_name" ]]  ; then
       $rvm_scripts_path/log "info" "Removing stale symlink from $(basename "$executable_name")"

data/scripts/rubygems

@@ -49,7 +49,7 @@ rubygems_setup() {
         $rvm_scripts_path/log "error" "There has been an error while trying to fetch the source. Aborting the installation." ; __rvm_pushpop ; return $result
       fi
       \mkdir -p "$rvm_src_path/$rvm_gem_package_name"
-      __rvm_run "rubygems.extract" "cat $rvm_archives_path/$rvm_gem_package_name.tgz | gunzip | tar xf - -C $rvm_src_path" "Extracting $rvm_gem_package_name ..."
+      __rvm_run "rubygems.extract" "gunzip < $rvm_archives_path/$rvm_gem_package_name.tgz | tar xf - -C $rvm_src_path" "Extracting $rvm_gem_package_name ..."
     fi
 
     builtin cd "$rvm_src_path/$rvm_gem_package_name"

data/scripts/rvm

@@ -61,16 +61,23 @@ if [[ "$rvm_loaded_flag" != "1" ]] || [[ "$rvm_reload_flag" = "1" ]] ; then
     source "$rvm_scripts_path/cli"
     source "$rvm_scripts_path/manpages"
     source "$rvm_scripts_path/cd"
+    source "$rvm_scripts_path/override_gem"
 
     rvm_loaded_flag=1
 
-    rvm_version="$(cat "${rvm_path}/lib/VERSION.yml" | tail -n 3 | sed 's/^.*: //g' | \tr "\n" '.' | sed 's/\.$//')" ; export rvm_version
+    rvm_version="$(tail -n 3 < "${rvm_path}/lib/VERSION.yml" | sed -e 's/^.*: //g' | \tr "\n" '.' | sed -e 's/\.$//')" ; export rvm_version
 
     alias rvm-restart="source '${rvm_path}/scripts/rvm'"
 
     if ! command -v ruby >/dev/null 2>&1 || command -v ruby | \grep -v rvm >/dev/null ; then
-     [[ -s "$rvm_environments_path/default" ]] && source "$rvm_environments_path/default"
+      if [[ -s "$rvm_environments_path/default" ]] ; then
+        source "$rvm_environments_path/default"
+      fi
     fi
+    
+    # Makes sure rvm_bin_path is in PATH atleast once.
+    __rvm_conditionally_add_bin_path
+    
   else
     printf "\n\$rvm_path is not set. rvm cannot load."
   fi

data/scripts/rvm-install

@@ -1,5 +1,7 @@
 #!/usr/bin/env bash
 
+#set -u # Error on uninitialized variables.
+
 if [[ -z "$rvm_selfcontained" ]]; then
   if [[ "root" = "$(whoami)" ]] || [[ -n "$rvm_prefix" && "$rvm_prefix" != "$HOME"/* ]]; then
     export rvm_selfcontained=0
@@ -15,6 +17,8 @@ if [[ -d "$install_source_path/scripts" ]] && [[ -s "$install_source_path/script
   builtin cd "$install_source_path"
 fi
 
+sleep=0.010
+
 source scripts/version
 source scripts/utility
 
@@ -44,7 +48,7 @@ spinner() {
   index=$((($spinner_counter % 8)))
   printf "\r${array[$index]}"
   let "spinner_counter=spinner_counter+1"
-  command -v perl > /dev/null 2>&1 && perl -e 'sleep 0.5'
+  sleep $sleep
 }
 
 if echo "$*" | \grep -q 'trace' ; then echo "$*" ; env | \grep '^rvm_' ; set -x ; fi
@@ -54,7 +58,7 @@ while [[ $# -gt 0 ]] ; do
   case "$token" in
     --auto)    rvm_auto_flag=1 ;;
     --prefix)  rvm_prefix="$1" ; shift ;;
-    --version) rvm_path="$(pwd)" ; __rvm_version ; unset rvm_path ; exit ;;
+    --version) rvm_path="$PWD" ; __rvm_version ; unset rvm_path ; exit ;;
     --help|*)  usage ;;
   esac
 done
@@ -89,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"}"
@@ -161,7 +165,7 @@ done
 #
 # Cleanse and purge...
 for file in rvm-prompt rvm rvmsudo rvm-shell rvm-auto-ruby ; do
-  spinner && perl -e 'sleep 0.2'
+  spinner && sleep $sleep
   \rm -f "$rvm_bin_path/$file"
   \cp -f "$source_path/binscripts/$file" $rvm_bin_path/
 done
@@ -197,7 +201,7 @@ fi
 spinner
 if [[ -d gemsets/ ]] ; then
   \mkdir -p "$rvm_gemsets_path"
-  for gemset_file in $(cd gemsets ; find . -iname '*.gems' | sed 's/^\.\///') ; do
+  for gemset_file in $(cd gemsets ; find \. -iname '*.gems' | sed 's/^\.\///') ; do
     destination="$rvm_gemsets_path/$gemset_file"
     destination_path="$(dirname "$destination")"
     if [[ ! -s "$destination" ]] ; then
@@ -210,7 +214,7 @@ fi
 spinner
 if [[ -d patchsets/ ]] ; then
   \mkdir -p "$rvm_patchsets_path"
-  for patchset_file in $(cd patchsets ; find . -iname '*' | sed 's/^\.\///') ; do
+  for patchset_file in $(cd patchsets ; find \. -iname '*' | sed 's/^\.\///') ; do
     destination="$rvm_patchsets_path/$patchset_file"
     destination_path="$(dirname "$destination")"
     if [[ ! -s "$destination" ]] ; then
@@ -306,7 +310,7 @@ printf "\nThank you for using rvm. I hope that it makes your work easier and mor
 printf "\nIf you have any questions, issues and/or ideas for improvement please hop in #rvm on irc.freenode.net and let me know."
 printf "\nMy irc nickname is 'wayneeseguin' and I hang out from ~09:00-17:00EST and again from ~21:00EST-~00:00EST."
 printf "\nIf I do not respond right away, please hang around after asking your question, I will respond as soon as I am back."
-printf "\nBe sure to get head often as rvm development happens fast, you can do this by typing 'rvm update --head'."
+printf "\nBe sure to get head often as rvm development happens fast, you can do this by running 'rvm update --head'."
 printf "\n  w$(tput setaf 2)⦿‿⦿$(tput sgr0)t!"
 printf "\n    ~ Wayne\n"
 

data/scripts/selector

@@ -229,8 +229,8 @@ __rvm_use() {
   if [[ "system" = "$rvm_ruby_interpreter" ]] ; then
 
     unset GEM_HOME GEM_PATH BUNDLE_PATH MY_RUBY_HOME RUBY_VERSION IRBRC
-    new_path="$(echo $PATH | \tr ':' '\n' | awk '$0 !~ /rvm/' | paste -sd : -)"
-    new_path="$rvm_bin_path:$new_path"
+
+    new_path="$rvm_bin_path:$(__rvm_remove_rvm_from_path ; printf $PATH)"
     if [[ -s $rvm_config_path/system ]] ; then
       \grep "MY_RUBY_HOME='$rvm_rubies_path" "$rvm_config_path/system" > /dev/null
       if [[ $? -eq 0 ]] ; then
@@ -283,14 +283,17 @@ __rvm_use() {
       $rvm_scripts_path/log "info" "Using $(basename $GEM_HOME | \tr '-' ' ' | sed 's/'${rvm_gemset_separator}'/ with gemset /')"
     fi
 
-    new_path="$(echo $PATH | \tr ':' '\n' | awk '$0 !~ /rvm/' | paste -sd : -)"
-    new_path="$GEM_HOME/bin:$rvm_ruby_global_gems_path/bin:$MY_RUBY_HOME/bin:$rvm_bin_path:$new_path"
+    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)"
   fi
 
   # Export ruby string and gem set me for extrenal scripts to take advantage of them.
   if [[ -n "$rvm_ruby_string" ]]  ; then export rvm_ruby_string  ; fi
   if [[ -n "$rvm_gemset_name" ]]  ; then export rvm_gemset_name ; fi
-  if [[ -n "$new_path" ]]         ; then export PATH="$new_path" ; unset new_path ; fi
+  if [[ -n "$new_path" ]]; then
+    export PATH="$new_path"
+    unset new_path
+    builtin hash -r
+  fi
   if [[ -n "$rvm_rvmrc_flag" ]]   ; then __rvm_set_rvmrc ; fi
 
   environment_id="$(__rvm_environment_identifier)"
@@ -340,9 +343,6 @@ __rvm_use() {
       if [[ $result -eq 1 ]] ; then $rvm_ruby_home/bin/maglev start ; fi
     fi
   fi
-
-  # Rehash executable locations, e.g. to force the shell to recognize new items in the path.
-  builtin hash -r
   rvm_hook="after_use" ; source $rvm_scripts_path/hook
 }
 

data/scripts/snapshot

@@ -34,7 +34,7 @@ snapshot_save() {
   \cp "$rvm_config_path/user" "$snapshot_temp_path/"
 
   $rvm_scripts_path/log "info" "Backing up your installed packages"
-  cat "$rvm_config_path/packages" | sed -e 's/-//' -e 's/^lib//' | awk -F= '{print $1}' | sort | uniq > "$snapshot_temp_path/packages"
+  sed -e 's/-//' -e 's/^lib//' < "$rvm_config_path/packages" | awk -F= '{print $1}' | sort | uniq > "$snapshot_temp_path/packages"
 
   $rvm_scripts_path/log "info" "Backing up all of your gemsets"
   \mkdir -p "$snapshot_temp_path/gems"
@@ -63,8 +63,8 @@ snapshot_save() {
   comm -2 -3 "$snapshot_ruby_name_file" "$snapshot_alias_name_file" > "$snapshot_installable_file"
   \rm -rf "$snapshot_ruby_name_file" "$snapshot_alias_name_file"
 
-  local snapshot_primary_ruby="$(cat "$snapshot_installable_file" | \grep '^\(ree\|ruby-1.8.7\)' | \grep -v '-head$' | sort -r | head -n1)"
-  local snapshot_ruby_order="$snapshot_primary_ruby $(cat "$snapshot_installable_file" | \grep -v "$snapshot_primary_ruby")"
+  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

data/scripts/tools

@@ -18,9 +18,14 @@ tools_path_identifier() {
     return 1
   fi
   # Change to the directory. Do in subshell to keep the env correct.
-  (source $rvm_scripts_path/rvm
-   cd "$1" >/dev/null 2>&1
-    __rvm_environment_identifier)
+  (
+    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

@@ -1,5 +1,7 @@
 #!/usr/bin/env bash
 
+#set -u # Error on uninitialized variables.
+
 if [[ -z "$rvm_selfcontained" ]]; then
   if [[ "root" = "$(whoami)" ]] || [[ -n "$rvm_prefix" && "$rvm_prefix" != "$HOME"/* ]]; then
     export rvm_selfcontained=0
@@ -15,6 +17,8 @@ if [[ -d "$install_source_path/scripts" ]] && [[ -s "$install_source_path/script
   builtin cd "$install_source_path"
 fi
 
+sleep=0.010
+
 source scripts/version
 source scripts/utility
 
@@ -44,7 +48,7 @@ spinner() {
   index=$((($spinner_counter % 8)))
   printf "\r${array[$index]}"
   let "spinner_counter=spinner_counter+1"
-  command -v perl > /dev/null 2>&1 && perl -e 'sleep 0.5'
+  sleep $sleep
 }
 
 if echo "$*" | \grep -q 'trace' ; then echo "$*" ; env | \grep '^rvm_' ; set -x ; fi
@@ -54,7 +58,7 @@ while [[ $# -gt 0 ]] ; do
   case "$token" in
     --auto)    rvm_auto_flag=1 ;;
     --prefix)  rvm_prefix="$1" ; shift ;;
-    --version) rvm_path="$(pwd)" ; __rvm_version ; unset rvm_path ; exit ;;
+    --version) rvm_path="$PWD" ; __rvm_version ; unset rvm_path ; exit ;;
     --help|*)  usage ;;
   esac
 done
@@ -89,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"}"
@@ -161,7 +165,7 @@ done
 #
 # Cleanse and purge...
 for file in rvm-prompt rvm rvmsudo rvm-shell rvm-auto-ruby ; do
-  spinner && perl -e 'sleep 0.2'
+  spinner && sleep $sleep
   \rm -f "$rvm_bin_path/$file"
   \cp -f "$source_path/binscripts/$file" $rvm_bin_path/
 done
@@ -197,7 +201,7 @@ fi
 spinner
 if [[ -d gemsets/ ]] ; then
   \mkdir -p "$rvm_gemsets_path"
-  for gemset_file in $(cd gemsets ; find . -iname '*.gems' | sed 's/^\.\///') ; do
+  for gemset_file in $(cd gemsets ; find \. -iname '*.gems' | sed 's/^\.\///') ; do
     destination="$rvm_gemsets_path/$gemset_file"
     destination_path="$(dirname "$destination")"
     if [[ ! -s "$destination" ]] ; then
@@ -210,7 +214,7 @@ fi
 spinner
 if [[ -d patchsets/ ]] ; then
   \mkdir -p "$rvm_patchsets_path"
-  for patchset_file in $(cd patchsets ; find . -iname '*' | sed 's/^\.\///') ; do
+  for patchset_file in $(cd patchsets ; find \. -iname '*' | sed 's/^\.\///') ; do
     destination="$rvm_patchsets_path/$patchset_file"
     destination_path="$(dirname "$destination")"
     if [[ ! -s "$destination" ]] ; then
@@ -306,7 +310,7 @@ printf "\nThank you for using rvm. I hope that it makes your work easier and mor
 printf "\nIf you have any questions, issues and/or ideas for improvement please hop in #rvm on irc.freenode.net and let me know."
 printf "\nMy irc nickname is 'wayneeseguin' and I hang out from ~09:00-17:00EST and again from ~21:00EST-~00:00EST."
 printf "\nIf I do not respond right away, please hang around after asking your question, I will respond as soon as I am back."
-printf "\nBe sure to get head often as rvm development happens fast, you can do this by typing 'rvm update --head'."
+printf "\nBe sure to get head often as rvm development happens fast, you can do this by running 'rvm update --head'."
 printf "\n  w$(tput setaf 2)⦿‿⦿$(tput sgr0)t!"
 printf "\n    ~ Wayne\n"
 

data/scripts/utility

@@ -156,12 +156,14 @@ __rvm_set_path_variable() {
 __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" | \tr -s '\n' ':' | sed 's#:$##')
+  PATH=$(echo $PATH | \tr -s ':' '\n' | \grep -v "rvm" | \tr -s '\n' ':' | sed 's#:$##')
   export PATH
+  builtin hash -r
 }
 
 # Run a specified command and log it.
@@ -283,7 +285,7 @@ __rvm_cleanup_temp_on_exit() {
 }
 
 __rvm_set_rvmrc() {
-  if [[ "$HOME" != "$(pwd)" ]] ; then
+  if [[ "$HOME" != "$PWD" ]] ; then
     if [[ "$rvm_verbose_flag" -eq 1 ]] ; then flags="use " ; fi
 
     if [[ -s .rvmrc ]] ; then
@@ -292,7 +294,7 @@ __rvm_set_rvmrc() {
     fi
 
     local identifier=$(__rvm_environment_identifier)
-    printf "if [[ -n \"\$rvm_environments_path\" && -s \"\$rvm_environments_path/$identifier\" ]] ; then\n  . \"\$rvm_environments_path/$identifier\"" > .rvmrc
+    printf "if [[ -n \"\$rvm_environments_path\" && -s \"\$rvm_environments_path/$identifier\" ]] ; then\n  \\. \"\$rvm_environments_path/$identifier\"" > .rvmrc
     printf "\nelse\n  rvm --create $flags \"$identifier\"\nfi" >> .rvmrc
 
     unset flags
@@ -354,11 +356,21 @@ __rvm_bin_script() {
   $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"
+    builtin hash -r
+  fi
+}
+
 # Reset any rvm gathered information about the system and its state.
 # rvm will refresh the stored information the next time it is called after reset.
 __rvm_reset() {
-  PATH="$(echo $PATH | \tr ':' '\n' | awk '$0 !~ /rvm/' | paste -sd : -)"
-  PATH="$rvm_bin_path:$PATH" ; export PATH
+  __rvm_remove_rvm_from_path
+  __rvm_conditionally_add_bin_path
+  export PATH
+  builtin hash -r
 
   for flag in default passenger editor ; do \rm -f "$rvm_bin_path"/${flag}_* ; done
   unset flag
@@ -422,10 +434,8 @@ __rvm_initialize() {
 
   __rvm_clean_path
 
-  if echo "$PATH" | \grep -q 'rvm\/bin:' ; then
-    PATH="${rvm_bin_path}:$PATH"
-    export PATH
-  fi
+  __rvm_conditionally_add_bin_path
+  export PATH
 
   \mkdir -p "$rvm_src_path" "$rvm_bin_path" "$rvm_archives_path" "$rvm_gems_path" "$rvm_tmp_path" "$rvm_repo_path"
 }
@@ -462,7 +472,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" "cat $rvm_archives_path/rvm-${stable_version}.tar.gz | gunzip | 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
@@ -531,12 +541,12 @@ __rvm_inspect() {
   for binary in $rvm_ruby_args ; do
     actual_file="$(command -v $binary)"
     $rvm_scripts_path/log "info" "$actual_file:"
-    if [[ -n "$rvm_shebang_flag" ]] ; then cat $actual_file | head -n 1    ; fi
-    if [[ -n "$rvm_env_flag" ]]     ; then cat $actual_file | awk '/ENV/'  ; fi
-    if [[ -n "$rvm_path_flag" ]]    ; then cat $actual_file | awk '/PATH/' ; fi
-    if [[ -n "$rvm_head_flag" ]]    ; then cat $actual_file | head -n 5    ; fi
-    if [[ -n "$rvm_tail_flag" ]]    ; then cat $actual_file | tail -n 5    ; fi
-    if [[ -n "$rvm_all_flag" ]]     ; then cat $actual_file                ; fi
+    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
+    if [[ -n "$rvm_head_flag" ]]    ; then head -n 5    < "$actual_file" ; fi
+    if [[ -n "$rvm_tail_flag" ]]    ; then tail -n 5    < "$actual_file" ; fi
+    if [[ -n "$rvm_all_flag" ]]     ; then cat $actual_file              ; fi
   done
 }
 
@@ -580,6 +590,7 @@ __rvm_mono_env() {
   export ACLOCAL_FLAGS="-I $ACLOCAL_PATH"
   export PKG_CONFIG_PATH="$rvm_usr_path/lib/pkgconfig:$PKG_CONFIG_PATH"
   PATH="$rvm_usr_path/bin:$PATH"
+  builtin hash -r
 }
 
 __rvm_become() {
@@ -638,7 +649,7 @@ __rvm_current_gemcache_dir() {
 }
 
 __rvm_Answer_to_the_Ultimate_Question_of_Life_the_Universe_and_Everything() {
-  for index in {1..750} ; do perl -e 'sleep 0.2'; echo -n '.' ; done ; printf "%d" 0x2A ; echo
+  for index in {1..750} ; do sleep 0.25 ; echo -n '.' ; done ; printf "%d" 0x2A ; echo
 }
 
 __rvm_ultimate_question() {
@@ -651,8 +662,9 @@ __rvm_ultimate_question() {
 __rvm_load_env_file() {
   if [[ -f "$rvm_environments_path/$1" ]]; then
     # Restore the path to it's state minus rvm
-    PATH="$(echo $PATH | \tr ':' '\n' | awk '$0 !~ /rvm/' | paste -sd : -)"
-    . "$rvm_environments_path/$1"
+    __rvm_remove_rvm_from_path
+    \. "$rvm_environments_path/$1"
+    builtin hash -r
   else
     rvm use "$1" >/dev/null 2>&1
   fi
@@ -720,7 +732,7 @@ __rvm_rvmrc_tools() {
       fi
     ;;
     load)
-      rvm_trust_rvmrcs=1 __rvm_project_rvmrc "$(dirname "$rvmrc_path")"
+      rvm_rvmrc_cwd="" rvm_trust_rvmrcs=1 __rvm_project_rvmrc "$(dirname "$rvmrc_path")"
     ;;
     *)
       echo "Usage: rvm rvmrc {trust,untrust,trusted,load,reset}"
@@ -731,7 +743,7 @@ __rvm_rvmrc_tools() {
 
 __rvm_check_rvmrc_trustworthiness() {
   # Trust when they have the flag... of doom!
-  [[ -z "$1" || "$rvm_trust_rvmrcs" = "1" ]] && return
+  [[ -z "$1" || "$rvm_trust_rvmrcs" = "1" ]] && return 0
   value="$(__rvm_rvmrc_stored_trust "$1")"
   if [[ -z "$value" ]] ; then
     __rvm_ask_to_trust "$1"
@@ -741,6 +753,7 @@ __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 "---"
@@ -775,7 +788,7 @@ __rvm_ask_to_trust() {
 __rvm_project_rvmrc() {
   local cwd
   # Get the first argument or the pwd.
-  cwd="${1:-"$(pwd)"}"
+  cwd="${1:-"$PWD"}"
   while : ; do
     if [[ -z "$cwd" || "$HOME" = "$cwd" || "/" = "$cwd" ]] ; then
       if [[ -n "$rvm_rvmrc_cwd" ]] ; then
@@ -789,10 +802,15 @@ __rvm_project_rvmrc() {
     else
       if [[ -f "$cwd/.rvmrc" ]] ; then
         if [[ "$rvm_rvmrc_cwd" != "$cwd" ]] ; then
-          if __rvm_check_rvmrc_trustworthiness "$cwd/.rvmrc" ; 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
         fi
         break
@@ -810,7 +828,7 @@ __rvm_record_install() {
   local rvm_install_command="$(echo "$recorded_ruby_name $rvm_install_arguments" | __rvm_strip)"
   \touch "$rvm_install_record_file"
   \rm -f "$rvm_install_record_file.tmp"
-  cat "$rvm_install_record_file" | \grep -v "^$recorded_ruby_name " > "$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"
@@ -821,7 +839,7 @@ __rvm_remove_install_record() {
   local 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"
-    cat "$rvm_install_record_file.tmp" | \grep -v "^$recorded_ruby_name " > "$rvm_install_record_file"
+    \grep -v "^$recorded_ruby_name " < "$rvm_install_record_file.tmp" > "$rvm_install_record_file"
     \rm -f "$rvm_install_record_file.tmp"
   fi
 }
@@ -831,7 +849,7 @@ __rvm_recorded_install_command() {
   [[ -z "$recorded_ruby_name" ]] && return 1
   local recorded_ruby_match="^$recorded_ruby_name "
   if [[ -s "$rvm_config_path/installs" ]] && \grep -q "$recorded_ruby_match" "$rvm_config_path/installs" ; then
-    cat "$rvm_config_path/installs" | \grep "$recorded_ruby_match" | head -n1
+    \grep "$recorded_ruby_match" < "$rvm_config_path/installs" | head -n1
   else
     return 1
   fi
@@ -853,7 +871,7 @@ __rvm_expand_ruby_string() {
   elif [[ "$1" = "all-gemsets" ]]; then
     $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
   elif [[ "$1" == "current-ruby" || "$1" = "gemsets" ]]; then
@@ -862,8 +880,8 @@ __rvm_expand_ruby_string() {
   elif [[ "$1" = "current" ]]; then
     __rvm_environment_identifier
   elif [[ "$1" = "aliases" ]]; then
-    cat "$rvm_config_path/alias" | awk -F= '{print $1}' | __rvm_strip
+    awk -F= '{print $1}' < "$rvm_config_path/alias" | __rvm_strip
   else
     echo "$1" | tr "," "\n" | __rvm_strip
   fi
-}
+}