rvm 1.0.0 → 1.0.1

data/lib/VERSION.yml

@@ -1,4 +1,4 @@
 ---
 :major: 1
 :minor: 0
-:patch: 0
+:patch: 1

data/lib/rvm/environment.rb

@@ -11,7 +11,8 @@ module RVM
     end
 
     # The default config has rvm_silence_logging so that log doesn't print anything to stdout.
-    merge_config! :rvm_silence_logging => 1
+    merge_config! :rvm_silence_logging => 1,
+                  :rvm_promptless      => 1
 
     attr_reader :environment_name, :shell_wrapper
 

data/lib/rvm/environment/tools.rb

@@ -8,7 +8,13 @@ module RVM
 
     # Gets the identifier after cd'ing to a path, no destructive.
     def tools_path_identifier(path)
-      normalize rvm(:tools, "path-identifier", path.to_s).stdout
+      path_identifier = rvm(:tools, "path-identifier", path.to_s)
+      if path_identifier.exit_status == 2
+        error_message = "The rvmrc located in '#{path}' could not be loaded, likely due to trust mechanisms."
+        error_message << " Please run 'rvm rvmrc {trust,untrust} \"#{path}\"' to continue, or set rvm_trust_rvmrcs to 1."
+        raise ErrorLoadingRVMRC, error_message
+      end
+      return normalize(path_identifier.stdout)
     end
 
     def tools_strings(*rubies)

data/lib/rvm/errors.rb

@@ -24,5 +24,8 @@ module RVM
   #
   # Provides access to the output of the shell command via +#result+.
   class IncompatibleRubyError < ErrorWithResult; end
+  
+  # Called when tools.path_identifier is called on a dir with an untrusted rvmrc.
+  class ErrorLoadingRVMRC < Error; end
 
 end

data/rvm.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rvm}
-  s.version = "1.0.0"
+  s.version = "1.0.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Wayne E. Seguin"]
-  s.date = %q{2010-08-22}
+  s.date = %q{2010-08-27}
   s.default_executable = %q{rvm-install}
   s.description = %q{Manages Ruby interpreter environments and switching between them.}
   s.email = %q{wayneeseguin@gmail.com}
@@ -37,7 +37,11 @@ Gem::Specification.new do |s|
      "gemsets/global.gems",
      "help/alias",
      "help/benchmark",
+     "help/cleanup",
      "help/debug",
+     "help/disk-usage",
+     "help/docs",
+     "help/exec",
      "help/fetch",
      "help/gem",
      "help/gemdir",
@@ -46,19 +50,25 @@ Gem::Specification.new do |s|
      "help/info",
      "help/install",
      "help/list",
+     "help/migrate",
      "help/monitor",
      "help/notes",
      "help/package",
      "help/rake",
      "help/remove",
+     "help/repair",
      "help/reset",
      "help/ruby",
+     "help/rubygems",
      "help/rvmrc",
+     "help/snapshot",
      "help/specs",
      "help/srcdir",
      "help/tests",
+     "help/tools",
      "help/uninstall",
      "help/update",
+     "help/upgrade",
      "help/use",
      "help/wrapper",
      "install",
@@ -123,6 +133,7 @@ Gem::Specification.new do |s|
      "scripts/migrate",
      "scripts/monitor",
      "scripts/notes",
+     "scripts/override_gem",
      "scripts/package",
      "scripts/patches",
      "scripts/patchsets",

data/scripts/alias

@@ -9,8 +9,8 @@ alias_conflicts_with_ruby() {
   [[ "$1" == "default" && ! -L "$rvm_rubies_path/default" ]] && return 1
   # Open for suggestions to a better way of doing this...
   alias_check_result="$(
-    . $rvm_scripts_path/initialize
-    . $rvm_scripts_path/selector
+    \. $rvm_scripts_path/initialize
+    \. $rvm_scripts_path/selector
     export rvm_ruby_string="$1"
     __rvm_ruby_string > /dev/null 2>&1
     echo "$?"

data/scripts/cli

@@ -1,14 +1,6 @@
 #!/usr/bin/env bash
 
-__rvm_usage() { cat "${rvm_path:-$HOME/.rvm}/README" | ${PAGER:-less} ; }
-# alternate usage impl: uses man page
-#__rvm_usage() {
-  #if [[ `which man` ]]; then
-    #man 1 rvm ; }
-  #else
-    #cat "${rvm_path:-$HOME/.rvm}/README" | ${PAGER:-less}
-  #fi
-#}
+__rvm_usage() { ${PAGER:-less} "${rvm_path:-$HOME/.rvm}/README" ; }
 
 __rvm_run_script() {
   local rvm_script_name="${1:-"$rvm_action"}"
@@ -143,7 +135,7 @@ __rvm_parse_args() {
         rvm_ruby_args="'load' $(__rvm_quote_args "$@")"
         rvm_parse_break=1
       ;;
-      
+
       rvmrc)
         rvm_action="rvmrc"
         rvm_ruby_args="$(__rvm_quote_args "$@")"
@@ -468,14 +460,16 @@ __rvm_parse_args() {
 rvm() {
   __rvm_setup
 
-  if [[ -n "$PS1" ]] ; then export rvm_interactive=1 ; else unset rvm_interactive ; fi
+  case $- in *i*) rvm_interactive=1 ;;
+              *) unset rvm_interactive ;;
+  esac ; export rvm_interactive
 
   if [[ -z "$ZSH_VERSION" ]] ; then
     trap '\rm -rf "$rvm_tmp_path/$$" >/dev/null 2>&1' 0 1 2 3 15
   fi
 
   # Check that this is the current version.
-  disk_version=$(cat "${rvm_path:-$HOME/.rvm}/lib/VERSION.yml" | tail -n 3 | sed 's/^.*: //g' | \tr "\n" '.' | sed 's/\.$//')
+  disk_version=$(tail -n 3 < "${rvm_path:-$HOME/.rvm}/lib/VERSION.yml" | sed -e 's/^.*: //g' | \tr "\n" '.' | sed -e 's/\.$//')
   if [[ "${rvm_version}" != "${disk_version}" ]] && [[ "reload" != "$1" ]]; then
     printf "\nA RVM version ${disk_version} is installed yet ${rvm_version} is loaded.\n Please do one of the following:\n  * 'rvm reload'\n  * open a new shell\n  * source your shell init scripts"
     return 1
@@ -551,7 +545,7 @@ rvm() {
       __rvm_run_script "$rvm_action"
       result=$?
     ;;
-    
+
     rvmrc)
       eval "__rvm_rvmrc_tools $rvm_ruby_args"
       result="$?"

data/scripts/disk-usage

@@ -5,7 +5,7 @@ rvm_base_except="selector"
 source "$rvm_scripts_path/base"
 
 usage() {
-  printf "Usage: 'rvm disk-usage {all,archives,repos,sources,logs,packages}'\n"
+  printf "Usage: 'rvm disk-usage {all,archives,repos,sources,logs,packages,rubies,gemsets}'\n"
   printf "       Lists the space rvm uses for a given item.\n"
   exit 1
 }
@@ -28,6 +28,8 @@ all_disk_usage() {
   sources_disk_usage
   logs_disk_usage
   packages_disk_usage
+  rubies_disk_usage
+  gemsets_disk_usage
   total_disk_usage
 }
 
@@ -40,12 +42,14 @@ repos_disk_usage()    { disk_usage "Repositories" "repo"; }
 sources_disk_usage()  { disk_usage "Extracted Source Code" "src"; }
 logs_disk_usage()     { disk_usage "Log Files" "log"; }
 packages_disk_usage() { disk_usage "Packages" "usr"; }
+rubies_disk_usage()   { disk_usage "Rubies" "rubies"; }
+gemsets_disk_usage()  { disk_usage "Gemsets" "gems"; }
 
 
 # Exit when there is no argument.
 [[ -z "$1" ]] && usage
 
 case "$1" in
-  all|archives|repos|sources|logs|total|packages) eval "$1_disk_usage" ;;
+  all|archives|repos|sources|logs|total|packages|rubies|gemsets) eval "$1_disk_usage" ;;
   *)        usage ;;
 esac

data/scripts/help

@@ -11,16 +11,16 @@ args=$(echo "$*" | awk '{$1=""; $2="" ; print}' | sed -e 's/^[[:space:]]*//' -e
 
 if [[ ! -z "$command" ]] && [[ -s "${rvm_help_path}/${command}" ]] ; then
   if [[ ! -z "$action" ]] && [[ -s "${rvm_help_path}/${command}/${action}" ]] ; then
-    cat "${rvm_help_path}/${command}/${action}" | ${PAGER:-less}
+    ${PAGER:-less} "${rvm_help_path}/${command}/${action}"
   else
-    cat "${rvm_help_path}/${command}" | ${PAGER:-less}
+    ${PAGER:-less} "${rvm_help_path}/${command}"
   fi
 else
-  cat "${rvm_path:-$HOME/.rvm}/README" | ${PAGER:-less}
-  $rvm_scripts_path/log "info" "\nCommands available with 'rvm help':\n\n $(builtin cd "${rvm_help_path}" ; \ls | \tr "\n" ' ')"
+  ${PAGER:-less} "${rvm_path:-$HOME/.rvm}/README"
+  $rvm_scripts_path/log "info" "Commands available with 'rvm help':\n\n    $(builtin cd "${rvm_help_path}" ; \ls | \tr "\n" ' ')"
 fi
 
-$rvm_scripts_path/log "info" "\nFor additional information please visit RVM's documentation website:\n\n    http://rvm.beginrescueend.com/"
-$rvm_scripts_path/log "info" "\nIf you still cannot find what an answer to your question, find me 'wayneeseguin' in #rvm on irc.freenode.net:\n\n    http://webchat.freenode.net/?channels=rvm\n"
+$rvm_scripts_path/log "info" "For additional information please visit RVM's documentation website:\n\n    http://rvm.beginrescueend.com/"
+$rvm_scripts_path/log "info" "If you still cannot find what an answer to your question, find me 'wayneeseguin' in #rvm on irc.freenode.net:\n\n    http://webchat.freenode.net/?channels=rvm\n"
 
 exit $?

data/scripts/info

@@ -7,10 +7,18 @@ rvm_ruby_gem_home="${rvm_ruby_gem_home:-$GEM_HOME}"
 
 if [[ ! -d "$rvm_ruby_gem_home" ]] && command -v gem > /dev/null 2>&1; then rvm_ruby_gem_home="$(gem env home)" ; fi
 
+version_for() {
+  if command -v "$1" >/dev/null ; then
+    $1 --version | head -n1
+  else
+    echo "not installed"
+  fi
+}
+
 info_system() {
   rvm_info="$rvm_info\n  system:\n    uname:       \"$(uname -a)\""
-  rvm_info="$rvm_info\n    zsh:         \"$(zsh --version)\""
-  rvm_info="$rvm_info\n    bash:        \"$(bash --version | head -n 1)\""
+  rvm_info="$rvm_info\n    zsh:         \"$(version_for zsh)\""
+  rvm_info="$rvm_info\n    bash:        \"$(version_for bash)\""
   rvm_info="$rvm_info\n"
 }
 
@@ -97,7 +105,7 @@ info_debug() {
 
   for file_name in $(echo $debug_files); do
     if [[ -f "$file_name" ]] && [[ -s "$file_name" ]] ; then
-      rvm_info="$rvm_info\n$file_name \(filtered\):\n$(cat $file_name | awk '!/assword|_key/')\n"
+      rvm_info="$rvm_info\n$file_name \(filtered\):\n$(awk '!/assword|_key/' < $file_name)\n"
     fi
   done
 

data/scripts/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/list

@@ -90,7 +90,7 @@ list_gemset_strings() {
 
 # This is meant to be used with scripting.
 list_known_strings() {
-  cat "$rvm_config_path/known" | sed -e 's/#.*$//g' -e 's/(//g' -e 's/)//g' | sort -r | uniq
+  sed -e 's/#.*$//g' -e 's/(//g' -e 's/)//g' < "$rvm_config_path/known" | sort -r | uniq
 }
 
 list_known() {
@@ -98,10 +98,11 @@ list_known() {
     list_known_strings
     return 0
   fi
-  if [[ -z "$rvm_interactive" ]] || [[ -z "$TERM" ]] || [[ "unknown" = "$TERM" ]] ; then
+
+  if [[ "$rvm_interactive" != "1" ]] ; then
     cat "$rvm_config_path/known"
   else
-    cat "$rvm_config_path/known" | ${PAGER:-less}
+    ${PAGER:-less} "$rvm_config_path/known"
   fi
 }
 

data/scripts/log

@@ -9,7 +9,7 @@ if [[ ! -z "$2" ]] ; then level=$1 ; shift ; else level="info" ; fi
 
 message="$(echo "$1" | sed 's/%/%%/g')"
 
-if [[ -z "$rvm_interactive" ]] || [[ -z "$TERM" ]] || [[ "unknown" = "$TERM" ]] ; then
+if [[ "$rvm_interactive" != "1" ]] ; then
   case "$level" in
     debug) shift ; printf "\n$level: $message\n"     ;;
     info)  shift ; printf "\n$level: $message\n"     ;;
@@ -28,5 +28,6 @@ else
     *) printf "$message"
   esac
 fi
+set +x
 
 exit 0

data/scripts/manage

@@ -64,7 +64,7 @@ __rvm_apply_patches() {
 
 __rvm_install_source() {
   [[ -z "$rvm_ruby_selected_flag" ]] && __rvm_select
-  
+
   if [[ "$rvm_ruby_string" = "ruby-1.9.2-head" ]] ; then
     # Ensure we have a base ruby.
     __rvm_ensure_has_18_compat_ruby || return 1
@@ -86,7 +86,11 @@ __rvm_install_source() {
     $rvm_scripts_path/log "error" "There has been an error, source directory is missing. Did the download or extraction fail? Aborting the installation." ; __rvm_pushpop ; return $result
   fi
 
-  if [[ -d "${rvm_path}/usr" ]] ; then export PATH="${rvm_path}/usr/bin:${PATH}" ; fi
+
+  if [[ -d "${rvm_path}/usr" ]] ; then
+    export PATH="${rvm_path}/usr/bin:${PATH}"
+    builtin hash -r
+  fi
 
   __rvm_apply_patches
   result="$?"
@@ -260,7 +264,7 @@ RubyWrapper
           fi
 
           \rm -rf "$rvm_ruby_src_path"
-          __rvm_run "extract" "cat $rvm_archives_path/$rvm_ruby_package_file.$rvm_archive_extension | gunzip | tar xf - -C $rvm_src_path" "Extracting $rvm_ruby_package_file ..."
+          __rvm_run "extract" "gunzip < \"$rvm_archives_path/$rvm_ruby_package_file.$rvm_archive_extension\" | tar xf - -C $rvm_src_path" "Extracting $rvm_ruby_package_file ..."
 
           result=$? ; if [[ "$result" -gt 0 ]] ; then
             $rvm_scripts_path/log "error" "There has been an error while trying to extract the source. Aborting the installation." ; __rvm_pushpop ; return $result
@@ -320,8 +324,9 @@ RubyWrapper
       unset CFLAGS LDFLAGS ARCHFLAGS # Important.
 
       unset BUNDLE_PATH GEM_HOME GEM_PATH MY_RUBY_HOME IRBRC
-      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
 
       if [[ -n "$(echo $rvm_ruby_version | awk '/^1\.0/')" ]] && [[ -z "$rvm_head_flag" ]] ; then
         $rvm_scripts_path/log "info" "Downloading $rvm_ruby_package_file, this may take a while depending on your connection..."
@@ -329,7 +334,7 @@ RubyWrapper
         result=$? ; if [[ "$result" -gt 0 ]] ; then
           $rvm_scripts_path/log "error" "There has been an error while trying to fetch the source. Aborting the installation." ; __rvm_pushpop ; return $result
         fi
-        __rvm_run "extract" "cat $rvm_archives_path/$(basename $rvm_ruby_package_file) | gunzip | tar xf - -C $rvm_src_path" "Extracting $rvm_ruby_package_file ..."
+        __rvm_run "extract" "gunzip < \"$rvm_archives_path/$(basename $rvm_ruby_package_file)\" | tar xf - -C $rvm_src_path" "Extracting $rvm_ruby_package_file ..."
 
         result=$? ; if [[ "$result" -gt 0 ]] ; then
           $rvm_scripts_path/log "error" "There has been an error while trying to extract the source. Aborting the installation." ; __rvm_pushpop ; return $result
@@ -450,7 +455,7 @@ RubyWrapper
         __rvm_inject_gem_env $rvm_ruby_home/bin/$binary
       done ; unset binary
 
-      __rvm_inject_ruby_shebang "$rvm_ruby_home/bin/rake" # #!/Users/nicksieger/Projects/ruby/jruby-15/dist/jruby-bin-1.5.0/bin/jruby -- lol!
+      __rvm_inject_ruby_shebang "$rvm_ruby_home/bin/rake"
 
       __rvm_rubygems_setup
       __rvm_irbrc
@@ -459,9 +464,12 @@ RubyWrapper
 
       __rvm_post_install
 
-      for rvm_gem_name in rake jruby-openssl ; do
-        __rvm_run "gems" "$rvm_ruby_home/bin/gem install $rvm_gem_name $rvm_gem_options" "Installing $rvm_gem_name"
-      done ; unset rvm_gem_name
+      # jruby ships with some built in gems, copy them in to place.
+      if [[ -d "$rvm_ruby_home/lib/ruby/gems/1.8" ]]; then
+        $rvm_scripts_path/log "info" "Copying across included gems"
+        cp -R "$rvm_ruby_home/lib/ruby/gems/1.8/" "$GEM_HOME/"
+      fi
+
     ;;
 
     maglev)
@@ -503,7 +511,7 @@ RubyWrapper
 
       builtin cd "$rvm_ruby_src_path"
 
-      __rvm_run "gemstone.extract" "cat $rvm_archives_path/${rvm_gemstone_package_file}.${rvm_archive_extension} | gunzip | tar xf - -C $rvm_ruby_src_path"
+      __rvm_run "gemstone.extract" "gunzip < \"$rvm_archives_path/${rvm_gemstone_package_file}.${rvm_archive_extension}\" | tar xf - -C $rvm_ruby_src_path"
       result=$? ; if [[ "$result" -gt 0 ]] ; then
         $rvm_scripts_path/log "error" "There has been an error while trying to extract the GemStone package. Aborting the installation." ; __rvm_pushpop ; return $result
       fi
@@ -623,7 +631,7 @@ RubyWrapper
       binaries=(gem irb rdoc rake ri ruby)
       for binary_name in ${binaries[@]} ; do
         if [[ -s $rvm_ruby_home/bin/$binary_name ]] ; then
-          cat "$rvm_ruby_home/bin/$binary_name" | \tr -d '\r' > "$rvm_ruby_home/bin/$binary_name.new"
+          \tr -d '\r' < "$rvm_ruby_home/bin/$binary_name" > "$rvm_ruby_home/bin/$binary_name.new"
           #sed -e '1,1s=.*=#!'"/usr/bin/env ir=" "$rvm_ruby_home/bin/$binary_name" > "$rvm_ruby_home/bin/$binary_name.new"
           mv -f "$rvm_ruby_home/bin/$binary_name.new" "$rvm_ruby_home/bin/$binary_name"
           chmod +x $rvm_ruby_home/bin/$binary_name
@@ -634,15 +642,16 @@ RubyWrapper
       mv -f "$rvm_ruby_home/bin/ir.new" "$rvm_ruby_home/bin/ir"
       chmod +x $rvm_ruby_home/bin/ir
       ln -fs $rvm_ruby_home/bin/ir $rvm_ruby_home/bin/ruby
-
+      builtin hash -r
       __rvm_run "gems.install" "PATH=$rvm_ruby_gem_home/bin:$rvm_ruby_global_gems_path/bin:$rvm_ruby_home/bin:$PATH GEM_HOME=$rvm_ruby_gem_home GEM_PATH=$rvm_ruby_gem_home $rvm_ruby_home/bin/gem install --no-rdoc --no-ri rake $rvm_gem_options" "Installing $rvm_gem_name to $dir"
     ;;
 
     mput|shyouhei)
       if [[ "rvm_make_flags_flag" -eq 1 ]] ; then __rvm_make_flags ; fi
       unset BUNDLE_PATH GEM_HOME GEM_PATH MY_RUBY_HOME IRBRC
-      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
 
       rvm_ruby_home="$rvm_rubies_path/$rvm_ruby_interpreter-$rvm_ruby_version"
 
@@ -782,7 +791,7 @@ __rvm_fetch_ruby() {
       \mkdir -p "/tmp/rvm_src_$$"
 
       if [[ "tar.gz" = "$rvm_archive_extension" ]] || [[ "tgz" = "$rvm_archive_extension" ]] ; then
-        __rvm_run "extract" "cat $rvm_archives_path/$rvm_ruby_package_file.$rvm_archive_extension | gunzip | tar xf - -C /tmp/rvm_src_$$" "Extracting $rvm_ruby_package_file ..."
+        __rvm_run "extract" "gunzip < \"$rvm_archives_path/$rvm_ruby_package_file.$rvm_archive_extension\" | tar xf - -C /tmp/rvm_src_$$" "Extracting $rvm_ruby_package_file ..."
         result=$? ; if [[ "$result" -gt 0 ]] ; then
           $rvm_scripts_path/log "error" "There has been an error while trying to extract the source. Aborting the installation." ; __rvm_pushpop ; return $result
         fi
@@ -792,7 +801,7 @@ __rvm_fetch_ruby() {
           $rvm_scripts_path/log "error" "There has been an error while trying to extract $rvm_ruby_package_file. Aborting the installation." ; __rvm_pushpop ; return $result
         fi
       elif [[ "tar.bz2" = "$rvm_archive_extension" ]] ; then
-        __rvm_run "extract" "cat $rvm_archives_path/$rvm_ruby_package_file.$rvm_archive_extension | bunzip2 | tar xf - -C /tmp/rvm_src_$$" "Extracting $rvm_ruby_package_file ..."
+        __rvm_run "extract" "bunzip2 < \"$rvm_archives_path/$rvm_ruby_package_file.$rvm_archive_extension\" | tar xf - -C /tmp/rvm_src_$$" "Extracting $rvm_ruby_package_file ..."
         result=$? ; if [[ "$result" -gt 0 ]] ; then
           $rvm_scripts_path/log "error" "There has been an error while trying to extract the source. Aborting the installation." ; __rvm_pushpop ; return $result
         fi
@@ -1120,7 +1129,7 @@ __rvm_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"