rvm 0.1.45 → 0.1.46

data/scripts/db

@@ -10,8 +10,8 @@ usage() {
 if [[ -f "$1" ]] ; then
   database_file="$1" ; shift
   if [[ ! -f "$database_file" ]] ; then
-    mkdir -p $(dirname $database_file)
-    touch $database_file
+    \mkdir -p $(dirname $database_file)
+    \touch $database_file
   fi
 else
   printf "\n\nDatabase file $1 does not exist.\n\n" >&2

data/scripts/docs

@@ -12,7 +12,7 @@ rvm_docs_type="${rvm_docs_type:-rdoc}"
 
 # Ensure we have the doc directories.
 if [[ ! -d "$rvm_docs_path" ]] ; then
-  mkdir -p "$rvm_docs_path/rdoc" "$rvm_docs_path/yard"
+  \mkdir -p "$rvm_docs_path/rdoc" "$rvm_docs_path/yard"
 fi
 
 usage() {
@@ -45,7 +45,7 @@ generate_ri() {
 
 generate_rdoc() {
   __rvm_pushpop "$rvm_src_path/$rvm_docs_ruby_string/"
-  rm -rf "$rvm_docs_path/$rvm_docs_ruby_string/$rvm_docs_type/"
+  \rm -rf "$rvm_docs_path/$rvm_docs_ruby_string/$rvm_docs_type/"
   $rvm_scripts_path/log "info" "Generating rdoc documentation, be aware that this could take a *long* time, and depends heavily on your system resources..."
   $rvm_scripts_path/log "info" "( Errors will be logged to $rvm_log_path/$rvm_docs_ruby_string/docs.error.log )"
   if gem list | grep -q ^hanna ; then

data/scripts/fetch

@@ -8,7 +8,7 @@ result=0
 trap 'cleanup_download' 1 2 3 15
 
 cleanup_download() {
-  [[ -f "$archive" ]] && rm -rf "$archive"
+  [[ -f "$archive" ]] && \rm -rf "$archive"
 }
 
 record_md5() {
@@ -66,7 +66,7 @@ fi
 http_url="$(echo $url | sed -e 's/ftp:/http:/' -e 's/git:/http:/')"
 
 if [[ $download -gt 0 ]] ; then
-  rm -f $archive
+  \rm -f $archive
   eval $fetch_command "$url"
   result=$?
   if [[ $result -gt 0 ]] ; then
@@ -77,11 +77,11 @@ if [[ $download -gt 0 ]] ; then
       try_http=1
     elif [[ $result -eq 18 ]] ; then
       $rvm_scripts_path/log "error" "Partial file. Only a part of the file was transferred. Removing partial and re-trying."
-      rm -f "$archive"
+      \rm -f "$archive"
       retry=1
     elif [[ $result -eq 33 ]] ; then
       if [[ ! -z "$rvm_debug_flag" ]] ; then $rvm_scripts_path/log "debug" "Server does not support 'range' command, removing '$archive'" ; fi
-      rm -f "$archive"
+      \rm -f "$archive"
       retry=1
     else
       $rvm_scripts_path/log "error" "There was an error, please check $rvm_ruby_log_path/*.error.log. Next we'll try to fetch via http."

data/scripts/gemsets

@@ -43,20 +43,20 @@ gemset_globalcache() {
       current_cache_path="$rvm_gems_path/$directory_name/cache"
       if [[ -L "$current_cache_path" && "$(readlink "$current_cache_path")" == "$rvm_gems_cache_path" ]]; then
         $rvm_scripts_path/log "info" "Reverting the gem cache for $directory_name to an empty directory."
-        rm -f "$current_cache_path" 2>/dev/null
-        mkdir -p "$current_cache_path" 2>/dev/null
+        \rm -f "$current_cache_path" 2>/dev/null
+        \mkdir -p "$current_cache_path" 2>/dev/null
       fi
     done; unset full_directory_path directory_name
     $rvm_scripts_path/db "$rvm_config_path/user" "use_gemset_globalcache" "delete"
   elif [[ "$1" == "enable" ]]; then
     $rvm_scripts_path/log "info" "Enabling global cache for gems."
-    mkdir -p "$rvm_gems_cache_path"
+    \mkdir -p "$rvm_gems_cache_path"
     for directory_name in $(\ls "$rvm_gems_path"); do
       current_cache_path="$rvm_gems_path/$directory_name/cache"
       if [[ -d "$current_cache_path" && ! -L "$current_cache_path" ]]; then
         $rvm_scripts_path/log "info" "Moving the gem cache for $directory_name to the global cache."
         mv "$current_cache_path/"*.gem "$rvm_gems_cache_path/" 2>/dev/null
-        rm -rf "$current_cache_path"
+        \rm -rf "$current_cache_path"
         ln -nfs "$rvm_gems_cache_path" "$current_cache_path"
       fi
     done; unset full_directory_path directory_name
@@ -80,12 +80,12 @@ gemset_create() {
   rvm_ruby_gem_prefix=$(echo $rvm_ruby_gem_home | sed 's/'${rvm_gemset_separator}'.*$//')
   for gemset in $(echo $gems_args) ; do
     gem_home="${rvm_ruby_gem_prefix}${rvm_gemset_separator}${gemset}"
-    mkdir -p "$gem_home"
+    \mkdir -p "$gem_home"
     # When the globalcache is enabled, we need to ensure we setup the cache directory correctly.
     if __rvm_using_gemset_globalcache; then
       if [[ -d "$gem_home/cache" && ! -L "$gem_home/cache" ]]; then
         mv "$gem_home/cache"/*.gem "$rvm_gems_cache_path/" 2>/dev/null
-        rm -rf "$gem_home/cache"
+        \rm -rf "$gem_home/cache"
       fi
       ln -nfs "$rvm_gems_cache_path" "$gem_home/cache"
     fi
@@ -114,14 +114,14 @@ gemset_delete() {
   if [[ ! -z "$rvm_gemset_name" ]] ; then
     gemdir="$rvm_gems_path/$rvm_ruby_string${rvm_gemset_separator}$rvm_gemset_name"
     if [[ -d "$gemdir" ]] && [[ "$gemdir" != '/' ]] && [[ ! -z "$rvm_force_flag" ]] ; then
-        rm -rf  "$gemdir"
+        \rm -rf  "$gemdir"
     elif [[ -d "$gemdir" ]] ; then
       $rvm_scripts_path/log "warn" "Are you SURE you wish to remove the entire gemset directory '$rvm_gemset_name' ($gemdir)?"
       echo -n "(anything other than 'yes' will cancel) > "
       read response
       if [[ "yes" = "$response" ]] ; then
-        rm -f $gemdir/cache 2>/dev/null
-        rm -rf $gemdir
+        \rm -f $gemdir/cache 2>/dev/null
+        \rm -rf $gemdir
       else
         $rvm_scripts_path/log "info" "Not doing anything, phew... close call that one eh?"
       fi
@@ -137,13 +137,13 @@ gemset_empty() {
   if [[ -z "$rvm_ruby_gem_home" ]] ; then __rvm_select ; fi
   gemdir="$rvm_ruby_gem_home"
   if [[ -d "$gemdir" ]] && [[ "$gemdir" != '/' ]] && [[ ! -z "$rvm_force_flag" ]] ; then
-    builtin cd $gemdir && rm -rf ./bin/* ./doc/* ./gems/* ./specifications/*
+    builtin cd $gemdir && \rm -rf ./bin/* ./doc/* ./gems/* ./specifications/*
   elif [[ -d "$gemdir" ]] ; then
     $rvm_scripts_path/log "warn" "Are you SURE you wish to remove the installed gemset for gemset '$(basename $gemdir)' ($gemdir)?"
     echo -n "(anything other than 'yes' will cancel) > "
     read response
     if [[ "yes" = "$response" ]] ; then
-      builtin cd $gemdir && rm -rf ./bin/* ./doc/* ./gems/* ./specifications/*
+      builtin cd $gemdir && \rm -rf ./bin/* ./doc/* ./gems/* ./specifications/*
     else
       $rvm_scripts_path/log "info" "Not doing anything, phew... close call that one eh?"
     fi
@@ -156,31 +156,31 @@ gemset_empty() {
 gemset_copy() {
   local source_ruby="$(echo "$gems_args" | awk '{print $1}')"
   local destination_ruby="$(echo "$gems_args" | awk '{print $2}')"
-  
+
   if [[ -z "$destination_ruby" || -z "$source_ruby" ]] ; then
     $rvm_scripts_path/log "error" "Source and destination must be specified: 'rvm gemset copy X Y'"
     return 1
   fi
-  
+
   local source_path="$(rvm_silence_logging=1 rvm "$source_ruby" gem env gemdir)"
   local destination_path="$(rvm_silence_logging=1 rvm "$destination_ruby" gem env gemdir)"
-  
+
   if [[ -z "$source_path" ]]; then
     $rvm_scripts_path/log "error" "Unable to expand ruby '$source_ruby'"
     return 1
   fi
-  
+
   if [[ -z "$destination_path" ]]; then
     $rvm_scripts_path/log "error" "Unable to expand ruby '$destination_ruby'"
     return 1
   fi
-  
+
   if [[ -d "$source_path" ]] ; then
-    [[ ! -d "$destination_path" ]] && mkdir -p "$destination_path"
+    [[ ! -d "$destination_path" ]] && \mkdir -p "$destination_path"
     $rvm_scripts_path/log "info" "Copying gemset from $source_ruby to $destination_ruby"
     for dir in bin doc gems specifications cache ; do
-      mkdir -p "$destination_path/$dir"
-      cp -Rf "$source_path/$dir" "$destination_path/"
+      \mkdir -p "$destination_path/$dir"
+      \cp -Rf "$source_path/$dir" "$destination_path/"
     done
     $rvm_scripts_path/log "info" "Making gemset for $destination_ruby pristine."
     __rvm_run_with_env "gemset.pristine" "$destination_ruby" "rvm gemset pristine"
@@ -209,7 +209,7 @@ gemset_export() {
 
   $rvm_scripts_path/log "info" "Exporting current environments gemset to $rvm_file_name"
 
-  touch $rvm_file_name
+  \touch $rvm_file_name
   echo "# $rvm_file_name generated gem export file. Note that any env variable settings will be missing. Append these after using a ';' field separator" > $rvm_file_name
   for gem in $(gem list | sed 's#[\(|\)]##g' | sed 's#, #,#g' | \tr ' ' ';') ; do
     name="$(echo $gem | awk -F';' '{print $1}')"
@@ -251,7 +251,7 @@ gemset_import() {
     return 1
   fi
 
-  mkdir -p "$rvm_gems_cache_path" # Ensure the base cache dir is initialized.
+  \mkdir -p "$rvm_gems_cache_path" # Ensure the base cache dir is initialized.
 
   if [[ -s "$rvm_file_name" ]] ; then
     echo "Importing  $rvm_file_name file..."
@@ -335,7 +335,7 @@ gem_install() {
         $rvm_scripts_path/log "info" "$gem_name $gem_version exists, skipping (--force to re-install)"
       else
         if [[ -s "$(__rvm_current_gemcache_dir)/$(basename $gem_file_name)" ]] ; then
-          mkdir -p "$rvm_tmp_path/$$/"
+          \mkdir -p "$rvm_tmp_path/$$/"
           mv "$(__rvm_current_gemcache_dir)/$gem_file_name" "$rvm_tmp_path/$$/$gem_file_name"
           gem="$rvm_tmp_path/$$/$gem_file_name -f -l"
         else
@@ -386,7 +386,7 @@ gemset_info() {
 gemset_prune() {
   temporary_cache_path="$GEM_HOME/temporary-cache"
   live_cache_path="$GEM_HOME/cache"
-  mkdir -p "$temporary_cache_path"
+  \mkdir -p "$temporary_cache_path"
   $rvm_scripts_path/log "info" "Moving active gems into temporary cache..."
   while read -r used_gem; do
     gem_name="$(echo "$used_gem" | sed -e 's/ .*//')"
@@ -401,7 +401,7 @@ gemset_prune() {
   done < <(gem list --versions)
   $rvm_scripts_path/log "info" "Removing live cache and restoring temporary cache..."
   # Switch the cache back.
-  rm -rf "$live_cache_path"
+  \rm -rf "$live_cache_path"
   mv "$temporary_cache_path" "$live_cache_path"
 }
 
@@ -412,7 +412,7 @@ gemset_pristine() {
 # Loads the default gemsets for the current interpreter and gemset.
 gemset_initial() {
   $rvm_scripts_path/log "info" "Importing initial gemsets for $(__rvm_environment_identifier)."
-  mkdir -p "$rvm_gemsets_path/$(echo "$rvm_ruby_string" | \tr '-' '/')" 2>/dev/null
+  \mkdir -p "$rvm_gemsets_path/$(echo "$rvm_ruby_string" | \tr '-' '/')" 2>/dev/null
   for gemsets_path in $(__rvm_ruby_string_paths_under "$rvm_gemsets_path") ; do
     if [[ -n "$rvm_gemset_name" ]] ; then
       if [[ -s "${gemsets_path}/${rvm_gemset_name}.gems" ]] ; then

data/scripts/info

@@ -8,15 +8,9 @@ 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
 
 info_system() {
-  rvm_info="$rvm_info\n  system:\n    uname:        \"$(uname -a)\""
-
-  if [[ ! -z "$ZSH_VERSION" ]]  ; then
-    rvm_info="$rvm_info\n    shell:        \"zsh\"\n     version:      \"$ZSH_VERSION\""
-  fi
-
-  if [[ ! -z "$BASH_VERSION" ]] ; then
-    rvm_info="$rvm_info\n    shell:        \"bash\"\n    version:      \"$BASH_VERSION\""
-  fi
+  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"
 }
 

data/scripts/initialize

@@ -3,8 +3,8 @@
 rvm_selfcontained="${rvm_selfcontained:-1}"
 
 if [[ "$rvm_selfcontained" = "0" ]] ; then
-  rvm_bin_path="${rvm_bin_path:-"$rvm_prefix/bin"}"
-  rvm_man_path="${rvm_man_path:-"$rvm_prefix/share/man"}"
+  rvm_bin_path="${rvm_bin_path:-"${rvm_prefix}bin"}"
+  rvm_man_path="${rvm_man_path:-"${rvm_prefix}share/man"}"
   rvm_rc_files="${rvm_rc_files:-"/etc/profile /etc/zshenv"}"
 else
   rvm_man_path="${rvm_man_path:-"$rvm_path/man"}"

data/scripts/install

@@ -96,8 +96,8 @@ rvm_src_path="${rvm_src_path:-"$rvm_path/src"}"
 rvm_log_path="${rvm_log_path:-"$rvm_path/log"}"
 
 if [[ "$rvm_selfcontained" = "0" ]] ; then
-  rvm_bin_path="${rvm_bin_path:-"$rvm_prefix/bin"}"
-  rvm_man_path="${rvm_man_path:-"$rvm_prefix/share/man"}"
+  rvm_bin_path="${rvm_bin_path:-"${rvm_prefix}bin"}"
+  rvm_man_path="${rvm_man_path:-"${rvm_prefix}share/man"}"
   rvm_rc_files="${rvm_rc_files:-"/etc/profile /etc/zshenv"}"
 else
   rvm_man_path="${rvm_man_path:-"$rvm_path/man"}"
@@ -126,11 +126,11 @@ fi
 
 spinner
 
-mkdir -p "$rvm_archives_path" "$rvm_src_path" "$rvm_log_path" "$rvm_bin_path" "$rvm_gems_path" "$rvm_rubies_path" "$rvm_config_path" "$rvm_hooks_path" "$rvm_tmp_path"
+\mkdir -p "$rvm_archives_path" "$rvm_src_path" "$rvm_log_path" "$rvm_bin_path" "$rvm_gems_path" "$rvm_rubies_path" "$rvm_config_path" "$rvm_hooks_path" "$rvm_tmp_path"
 
 for file in README LICENCE ; do
   spinner
-  cp -f "$source_path/$file" "$rvm_path/"
+  \cp -f "$source_path/$file" "$rvm_path/"
 done
 
 #
@@ -138,22 +138,22 @@ done
 #
 for dir_name in config scripts examples lib hooks help patches; do
   spinner
-  mkdir -p "$rvm_path/$dir_name"
+  \mkdir -p "$rvm_path/$dir_name"
   if [[ -d "$source_path/$dir_name" ]] ; then
-    cp -Rf "$source_path/$dir_name" "$rvm_path"
+    \cp -Rf "$source_path/$dir_name" "$rvm_path"
   fi
 done ; unset dir_name
 
 spinner
 if [[ ! -s "$rvm_config_path/user" ]] ; then
-  mkdir -p "$rvm_config_path/"
+  \mkdir -p "$rvm_config_path/"
   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")
 for script_name in "${scripts[@]}" ; do
   spinner
-  chmod +x $rvm_scripts_path/$script_name
+  chmod +x "$rvm_scripts_path/$script_name" 2>/dev/null # Hide errors.
 done
 
 #
@@ -162,8 +162,8 @@ done
 # Cleanse and purge...
 for file in rvm-prompt rvm rvmsudo rvm-shell rvm-auto-ruby ; do
   spinner && perl -e 'sleep 0.2'
-  rm -f "$rvm_bin_path/$file"
-  cp -f "$source_path/binscripts/$file" $rvm_bin_path/
+  \rm -f "$rvm_bin_path/$file"
+  \cp -f "$source_path/binscripts/$file" $rvm_bin_path/
 done
 spinner
 chmod +x $rvm_bin_path/*
@@ -176,7 +176,7 @@ 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
-      if [[ ! -f $rcfile ]] ; then touch $rcfile ; fi
+      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."
@@ -196,26 +196,26 @@ fi
 #
 spinner
 if [[ -d gemsets/ ]] ; then
-  mkdir -p "$rvm_gemsets_path"
+  \mkdir -p "$rvm_gemsets_path"
   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
-      mkdir -p "$destination_path"
-      cp "gemsets/$gemset_file" "$destination"
+      \mkdir -p "$destination_path"
+      \cp "gemsets/$gemset_file" "$destination"
     fi
   done ; unset destination destination_path gemset_file
 fi
 
 spinner
 if [[ -d patchsets/ ]] ; then
-  mkdir -p "$rvm_patchsets_path"
+  \mkdir -p "$rvm_patchsets_path"
   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
-      mkdir -p "$destination_path"
-      cp "patchsets/$patchset_file" "$destination"
+      \mkdir -p "$destination_path"
+      \cp "patchsets/$patchset_file" "$destination"
     fi
   done ; unset destination destination_path patchset_file
 fi
@@ -224,7 +224,7 @@ fi
 # Migrate ~/.rvm/ruby-X,jruby-X,... to ~/.rvm/rubies/ for 0.1.0.
 #
 rvm_rubies_path="${rvm_rubies_path:-"$rvm_path/rubies"}"
-mkdir -p "$rvm_rubies_path/"
+\mkdir -p "$rvm_rubies_path/"
 spinner
 for ruby in $rvm_path/ruby-* $rvm_path/jruby-* $rvm_path/mput-* $rvm_path/rbx-* $rvm_path/maglev-* $rvm_path/ree-* ; do
   if [[ -d "$ruby" ]] ; then
@@ -280,7 +280,7 @@ if [[ -s "$rvm_config_path/default" ]]; then
     $rvm_scripts_path/alias create default "$original_version" &> /dev/null
   fi
   unset original_version
-  rm -rf "$rvm_config_path/default"
+  \rm -rf "$rvm_config_path/default"
 fi
 
 #
@@ -288,14 +288,14 @@ fi
 #
 
 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
 printf "\n    Copying manpages into place."
 for man_file in $(\ls "$install_source_path/man"); do
-  rm -rf "$rvm_man_path/$man_file"
-  cp -R "$install_source_path/man/$man_file" "$rvm_man_path/"
+  \rm -rf "$rvm_man_path/$man_file"
+  \cp -R "$install_source_path/man/$man_file" "$rvm_man_path/"
 done
 
 [[ "$upgrade_flag" = 0 ]] && ./scripts/notes
@@ -319,7 +319,7 @@ if [[ "$upgrade_flag" -eq 1 ]] ; then
   check_rubyopt_conditions
   printf "\nUpgrade of RVM in $rvm_path/ is complete.\n\n"
 else
-  if [[ -z "$rvm_prefix" ]] && [[ "root" != "$(whoami)" ]] ; then
+  if [[ "$rvm_selfcontained" = "1" ]] ; then
     printf "\n$(tput setaf 1)You must now finish the install manually:$(tput sgr0)"
     printf "\n1) Place the folowing line at the end of your shell's loading files(.bashrc or .bash_profile for bash and .zshrc for zsh), after all path/variable settings:"
     printf "\n     [[ -s \$HOME/.rvm/scripts/rvm ]] && source \$HOME/.rvm/scripts/rvm"

data/scripts/list

@@ -35,7 +35,7 @@ list_gemsets() {
   done ; unset version
 
   if [[ -f "$rvm_config_path/default" ]] && [[ -s $rvm_config_path/default ]] ; then
-    version=$(grep 'MY_RUBY_HOME' $rvm_config_path/default | head -n 1 | awk -F"'" '{print $2}' | xargs basename)
+    version=$(grep 'MY_RUBY_HOME' $rvm_config_path/default | head -n1 | awk -F"'" '{print $2}' | xargs basename)
     if [[ ! -z "$version" ]] ; then
       printf "\n\nDefault Ruby (for new shells)\n"
       string="[ $(file $rvm_rubies_path/$version/bin/ruby | awk '/x86.64/ {print "x86_64"} /386/ {print "i386"} /ppc/ {print "ppc"}' | \tr "\n" ' ')]"
@@ -81,7 +81,7 @@ list_strings() {
 # This is meant to be used with scripting.
 list_gemset_strings() {
   local all_rubies="$(list_strings)"
-  for gemset in $(\ls $rvm_gems_path/ 2>/dev/null | xargs -- basename | grep -v '^\(@\|doc$\|cache$\|system$\)' | sort); do
+  for gemset in $(\ls $rvm_gems_path/ 2>/dev/null | xargs -n1 basename | grep -v '^\(@\|doc$\|cache$\|system$\)' | sort); do
     local ruby_name="$(echo "$gemset" | awk -F$rvm_gemset_separator '{print $1}')"
     [[ "$all_rubies" != *"$ruby_name"* ]] && continue
     echo "$gemset"

data/scripts/manage

@@ -67,7 +67,7 @@ __rvm_install_source() {
 
   $rvm_scripts_path/log "info" "Installing Ruby from source to: $rvm_ruby_home"
   __rvm_pushpop "$rvm_src_path"
-  if [[ -n "$rvm_force_flag" ]] ; then rm -rf "$rvm_ruby_home" "$rvm_ruby_src_path" ; fi
+  if [[ -n "$rvm_force_flag" ]] ; then \rm -rf "$rvm_ruby_home" "$rvm_ruby_src_path" ; fi
 
   result=0
   __rvm_fetch_ruby
@@ -124,7 +124,7 @@ __rvm_install_source() {
     $rvm_scripts_path/log "error" "There has been an error while running make. Aborting the installation." ; __rvm_pushpop ; return $result
   fi
 
-  if [[ -d .ext/rdoc ]] ; then rm -rf .ext/rdoc ; fi
+  if [[ -d .ext/rdoc ]] ; then \rm -rf .ext/rdoc ; fi
 
   rvm_ruby_make_install=${rvm_ruby_make_install:-"make install"}
   __rvm_run "install" "$rvm_ruby_make_install" "Installing $rvm_ruby_string"
@@ -184,7 +184,7 @@ __rvm_install_ruby() {
           fi
           mv "$rvm_archives_path/macruby_nightly-latest.pkg" "$rvm_archives_path/macruby_nightly.pkg"
           __rvm_run "macruby/extract" "sudo /usr/sbin/installer -pkg '$rvm_archives_path/macruby_nightly.pkg' -target '/'"
-          mkdir -p "$rvm_ruby_home/bin"
+          \mkdir -p "$rvm_ruby_home/bin"
         else
           macruby_path="/Library/Frameworks/MacRuby.framework/Versions/${rvm_ruby_version}/usr/bin"
           # TODO: Separated nightly from head.
@@ -193,11 +193,11 @@ __rvm_install_ruby() {
           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
-          mkdir -p $rvm_ruby_src_path
+          \mkdir -p $rvm_ruby_src_path
           unzip -o -j "$rvm_archives_path/$rvm_ruby_package_file" "MacRuby ${rvm_ruby_version}/MacRuby ${rvm_ruby_version}.pkg" -d "$rvm_ruby_src_path"
           mv "$rvm_ruby_src_path/MacRuby ${rvm_ruby_version}.pkg" "$rvm_ruby_src_path/$rvm_ruby_string.pkg"
           __rvm_run "macruby/extract" "sudo /usr/sbin/installer -pkg '$rvm_ruby_src_path/$rvm_ruby_string.pkg' -target '/'"
-          mkdir -p "$rvm_ruby_home/bin"
+          \mkdir -p "$rvm_ruby_home/bin"
         fi
 
         binaries=(erb gem irb rake rdoc ri ruby testrb)
@@ -216,7 +216,7 @@ RubyWrapper
 )
 
           file_name="$rvm_ruby_home/bin/$binary_name"
-          rm -f $file_name
+          \rm -f $file_name
           echo "$ruby_wrapper" > $file_name
           if [[ -f $file_name ]] ; then chmod +x $file_name ; fi
           if [[ "$binary_name" = "ruby" ]] ; then
@@ -244,7 +244,7 @@ RubyWrapper
             $rvm_scripts_path/log "error" "There has been an error while trying to fetch the source. Aborting the installation." ; __rvm_pushpop ; return $result
           fi
 
-          rm -rf "$rvm_ruby_src_path"
+          \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 ..."
 
           result=$? ; if [[ "$result" -gt 0 ]] ; then
@@ -255,7 +255,7 @@ RubyWrapper
         fi
         builtin cd "$rvm_ruby_src_path"
 
-        mkdir -p "${rvm_ruby_home}/lib/ruby/gems/1.8/gems"
+        \mkdir -p "${rvm_ruby_home}/lib/ruby/gems/1.8/gems"
         if [[ -n "$rvm_ruby_configure_flags" ]] ; then
           rvm_ruby_configure_flags="$(echo $rvm_ruby_configure_flags | sed 's#--#-c --#g')"
         fi
@@ -321,7 +321,7 @@ RubyWrapper
         fi
 
         # Remove the left over folder first.
-        rm -rf "$rvm_ruby_src_path"
+        \rm -rf "$rvm_ruby_src_path"
         mv "$rvm_src_path/rubinius-${rvm_ruby_version}" "$rvm_ruby_src_path"
       else
         __rvm_db "rubinius_repo_url" "rvm_ruby_repo_url"
@@ -374,14 +374,14 @@ RubyWrapper
 
       # Install IRB Wrapper on Rubinius.
       file_name="$rvm_ruby_home/bin/irb"
-      rm -f "$file_name"
+      \rm -f "$file_name"
       printf '#!/usr/bin/env bash\n' > "$file_name"
       printf "exec '$rvm_ruby_home/bin/rbx' 'irb' \"\$@\"\n" >> "$file_name"
       [[ -f "$file_name" ]] && chmod +x "$file_name"
 
       # Install Gem Wrapper on Rubinius.
       file_name="$rvm_ruby_home/bin/gem"
-      cp -f "$rvm_ruby_home/lib/bin/gem.rb" "$file_name"
+      \cp -f "$rvm_ruby_home/lib/bin/gem.rb" "$file_name"
       __rvm_inject_ruby_shebang "$file_name"
       [[ -f "$file_name" ]] && chmod +x "$file_name"
       unset file_name
@@ -406,7 +406,7 @@ RubyWrapper
       builtin cd "$rvm_ruby_src_path"
       if [[ -n "$rvm_head_flag" ]] ; then __rvm_run "ant.dist" "ant dist" "Running 'ant dist' (this could take a few minutes) ..." ; fi
 
-      mkdir -p "$rvm_ruby_home/bin/"
+      \mkdir -p "$rvm_ruby_home/bin/"
       if $rvm_scripts_path/match "$rvm_ruby_version" "1\.3" || $rvm_scripts_path/match "$rvm_ruby_version" "1\.2" ; then
         __rvm_run "nailgun" "builtin cd \"$rvm_ruby_src_path/tool/nailgun\" &&  make $rvm_make_flags" "Building Nailgun"
       else
@@ -417,7 +417,7 @@ RubyWrapper
 
       if [[ -z "$rvm_ruby_home" ]] || [[ "$rvm_ruby_home" = "/" ]] ; then echo "WTH?!?! rvm_ruby_home == / ??? not removing." ; return 1000000 ; fi
 
-      rm -rf $rvm_ruby_home
+      \rm -rf $rvm_ruby_home
       __rvm_run "install" "/bin/cp -Rf $rvm_ruby_src_path $rvm_ruby_home" "Installing JRuby to $rvm_ruby_home"
 
       __rvm_pushpop $rvm_ruby_home/bin/
@@ -461,7 +461,7 @@ RubyWrapper
       __rvm_pushpop $rvm_src_path
 
       if [[ ! -d "$rvm_src_path/$rvm_ruby_string" ]] || [[ -n "$rvm_force_flag" ]] ; then
-        rm -rf "$rvm_src_path/$rvm_ruby_string/" "$rvm_src_path/$rvm_ruby_string/"
+        \rm -rf "$rvm_src_path/$rvm_ruby_string/" "$rvm_src_path/$rvm_ruby_string/"
         __rvm_fetch_ruby
         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
@@ -499,7 +499,7 @@ RubyWrapper
       __rvm_pushpop
 
       if [[ -z "$rvm_ruby_home" ]] || [[ "$rvm_ruby_home" = "/" ]] ; then echo "WTH?!?! rvm_ruby_home == / ??? not removing." ; return 1000000 ; fi
-      rm -rf $rvm_ruby_home
+      \rm -rf $rvm_ruby_home
       __rvm_run "install" "/bin/cp -Rf $rvm_ruby_src_path $rvm_ruby_home" "Installing maglev to $rvm_ruby_home"
 
       __rvm_pushpop $rvm_ruby_home/bin/
@@ -579,13 +579,13 @@ RubyWrapper
           unset compatible_ruby
           if [[ $? -gt 0 ]] ; then result=$? ; return $result ; fi
 
-          rm -rf $rvm_ruby_home/*
-          mkdir -p $rvm_ruby_home/bin $rvm_ruby_home/lib $rvm_ruby_home/lib/ruby $rvm_ruby_home/lib/IronRuby
+          \rm -rf $rvm_ruby_home/*
+          \mkdir -p $rvm_ruby_home/bin $rvm_ruby_home/lib $rvm_ruby_home/lib/ruby $rvm_ruby_home/lib/IronRuby
 
-          cp -r $rvm_ruby_src_path/Merlin/Main/Bin/mono_release/* $rvm_ruby_home/bin/
-          cp -r $rvm_ruby_src_path/Merlin/Main/Languages/Ruby/Scripts/bin/* $rvm_ruby_home/bin/
-          cp -r $rvm_ruby_src_path/Merlin/External.LCA_RESTRICTED/Languages/Ruby/redist-libs/ruby/* $rvm_ruby_home/lib/ruby
-          cp -r $rvm_ruby_src_path/Merlin/Main/Languages/Ruby/Libs/* $rvm_ruby_home/lib/IronRuby
+          \cp -r $rvm_ruby_src_path/Merlin/Main/Bin/mono_release/* $rvm_ruby_home/bin/
+          \cp -r $rvm_ruby_src_path/Merlin/Main/Languages/Ruby/Scripts/bin/* $rvm_ruby_home/bin/
+          \cp -r $rvm_ruby_src_path/Merlin/External.LCA_RESTRICTED/Languages/Ruby/redist-libs/ruby/* $rvm_ruby_home/lib/ruby
+          \cp -r $rvm_ruby_src_path/Merlin/Main/Languages/Ruby/Libs/* $rvm_ruby_home/lib/IronRuby
       else
         $rvm_scripts_path/log "info" "Retrieving IronRuby"
 
@@ -594,14 +594,14 @@ RubyWrapper
           $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_ruby_src_path $rvm_ruby_home
+        \mkdir -p $rvm_ruby_src_path $rvm_ruby_home
         unzip -o  -d ${rvm_ruby_src_path} ${rvm_archives_path}/${rvm_ruby_package_file} >> "$rvm_ruby_log_path/extract.log" 2>> "$rvm_ruby_log_path/extract.error.log"
         result=$? ; if [[ "$result" -gt 1 ]] ; then
           $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
 
         for dir in bin lib silverlight ; do
-          cp -Rf $rvm_src_path/$rvm_ruby_string/$dir "$rvm_ruby_home/$dir"
+          \cp -Rf $rvm_src_path/$rvm_ruby_string/$dir "$rvm_ruby_home/$dir"
         done
       fi
 
@@ -711,9 +711,9 @@ RubyWrapper
 }
 
 __rvm_fetch_from_github() {
-  rm -rf "$rvm_ruby_src_path"
+  \rm -rf "$rvm_ruby_src_path"
   if [[ ! -d "$rvm_ruby_repo_path/.git" ]] ; then
-    rm -rf "$rvm_ruby_repo_path"
+    \rm -rf "$rvm_ruby_repo_path"
     builtin cd "$rvm_home"
     __rvm_run "$1.repo" "git clone --depth 1 $rvm_ruby_repo_url $rvm_ruby_repo_path" "Cloning $rvm_ruby_repo_url"
     result=$? ; if [[ "$result" -gt 0 ]] ; then
@@ -726,7 +726,7 @@ __rvm_fetch_from_github() {
     builtin cd "$rvm_ruby_repo_path"
     __rvm_run "$1.repo" "git pull origin $branch" "Pulling from origin $branch"
   fi
-  __rvm_run "$1.copy" "cp -R \"$rvm_ruby_repo_path\" \"$rvm_ruby_src_path\"" "Copying from repo to source..."
+  __rvm_run "$1.copy" "\\cp -R \"$rvm_ruby_repo_path\" \"$rvm_ruby_src_path\"" "Copying from repo to source..."
   builtin cd "$rvm_ruby_src_path"
 }
 
@@ -758,9 +758,9 @@ __rvm_fetch_ruby() {
     fi
 
     if [[ ! -d "$rvm_ruby_src_path" ]] || [[ -n "$rvm_force_flag" ]] ; then
-      rm -rf "$rvm_ruby_src_path" # Especially when forced, we want to ensure the destination is missing.
+      \rm -rf "$rvm_ruby_src_path" # Especially when forced, we want to ensure the destination is missing.
 
-      mkdir -p "/tmp/rvm_src_$$"
+      \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 ..."
@@ -774,7 +774,7 @@ __rvm_fetch_ruby() {
         fi
       fi
 
-      mv "/tmp/rvm_src_$$/$(\cd /tmp/rvm_src_$$ ; \ls)" "$rvm_ruby_src_path" ; rm -rf "/tmp/rvm_src_$$"
+      mv "/tmp/rvm_src_$$/$(\cd /tmp/rvm_src_$$ ; \ls)" "$rvm_ruby_src_path" ; \rm -rf "/tmp/rvm_src_$$"
 
       if [[ -n "$rvm_ruby_name" ]] && [[ -d "$rvm_src_path/$(echo $rvm_ruby_string | sed -e 's/-n.*//')" ]] ; then
         mv "$rvm_src_path/$(echo $rvm_ruby_string | sed -e 's/-n.*//')" "$rvm_ruby_src_path"
@@ -786,7 +786,7 @@ __rvm_fetch_ruby() {
 
   else
 
-    mkdir -p "$rvm_repo_path"
+    \mkdir -p "$rvm_repo_path"
     if [[ -n "$(echo $rvm_url | awk '/^git/')" ]] ; then
       if [[ -d "$rvm_ruby_repo_path/.git" ]] ; then
         builtin cd $rvm_ruby_repo_path
@@ -807,7 +807,7 @@ __rvm_fetch_ruby() {
           fi
         fi
       else
-        rm -rf "$rvm_ruby_repo_path"
+        \rm -rf "$rvm_ruby_repo_path"
         rvm_ruby_repo_http_url="$(echo $rvm_ruby_repo_url | sed -e 's/git:/http:/')"
         $rvm_scripts_path/log "info" "Cloning from $rvm_ruby_repo_url, this may take a while depending on your connection..."
         git clone --depth 1 "$rvm_ruby_repo_url" "$rvm_ruby_repo_path"
@@ -852,7 +852,7 @@ __rvm_fetch_ruby() {
           __rvm_run "svn.checkout" "svn update -q ${rvm_rev/-r/-r }"
         fi
       else
-        rm -rf $rvm_ruby_repo_path
+        \rm -rf $rvm_ruby_repo_path
         __rvm_run "svn.checkout" "svn checkout -q ${rvm_rev/-r/-r } $rvm_url $rvm_ruby_repo_path" "Downloading source from ${rvm_url}."
       fi
       result=$? ; if [[ "$result" -gt 0 ]] ; then
@@ -861,8 +861,8 @@ __rvm_fetch_ruby() {
 
     fi
     $rvm_scripts_path/log "info" "Copying from repo to src path..."
-    rm -rf "$rvm_ruby_src_path"
-    cp -R "$rvm_ruby_repo_path" "$rvm_ruby_src_path"
+    \rm -rf "$rvm_ruby_src_path"
+    \cp -R "$rvm_ruby_repo_path" "$rvm_ruby_src_path"
   fi
 }
 
@@ -882,12 +882,12 @@ __rvm_uninstall_ruby() {
     for dir in $rvm_rubies_path ; do
       if [[ -d $dir/$rvm_ruby_string ]] ; then
         $rvm_scripts_path/log "info" "Removing $dir/$rvm_ruby_string..."
-        rm -rf $dir/$rvm_ruby_string
+        \rm -rf $dir/$rvm_ruby_string
       else
         $rvm_scripts_path/log "info" "$dir/$rvm_ruby_string has already been removed."
       fi
       if [[ -e $rvm_bin_path/$rvm_ruby_string ]] ; then
-        rm -f $rvm_bin_path/$rvm_ruby_string
+        \rm -f $rvm_bin_path/$rvm_ruby_string
       fi
     done ; unset dir
 
@@ -909,13 +909,13 @@ __rvm_remove_ruby() {
     for dir in $rvm_src_path $rvm_rubies_path ; do
       if [[ -d $dir/$rvm_ruby_string ]] ; then
         $rvm_scripts_path/log "info" "Removing $dir/$rvm_ruby_string..."
-        rm -rf $dir/$rvm_ruby_string
+        \rm -rf $dir/$rvm_ruby_string
       else
         $rvm_scripts_path/log "info" "it seems that $dir/$rvm_ruby_string is already non existent."
       fi
 
       if [[ -e $rvm_bin_path/$rvm_ruby_string ]] ; then
-        rm -f $rvm_bin_path/$rvm_ruby_string
+        \rm -f $rvm_bin_path/$rvm_ruby_string
       fi
 
       __rvm_check_default
@@ -939,7 +939,7 @@ __rvm_remove_gemsets() {
     gemsets="$rvm_gems_path/$rvm_ruby_string $(\ls -d "${rvm_gems_path}"/* | awk '/'$rvm_ruby_string'@/')"
     for gemset in $gemsets ; do
       if [[ -d "$gemset" ]] ; then
-        rm -rf "$gemset"
+        \rm -rf "$gemset"
       fi
     done ; unset gemset gemsets
   fi
@@ -949,7 +949,7 @@ __rvm_remove_wrappers() {
   $rvm_scripts_path/log "info" "Removing $rvm_ruby_string wrappers..."
   wrappers="$rvm_wrappers_path/$rvm_ruby_string $(\ls -d "$rvm_wrappers_path"/* 2>/dev/null | awk '/'$rvm_ruby_string'@/')"
   for wrapper in $wrappers ; do
-    rm -rf "$wrapper"
+    \rm -rf "$wrapper"
   done ; unset wrapper wrappers
 }
 
@@ -957,7 +957,7 @@ __rvm_remove_environments() {
   $rvm_scripts_path/log "info" "Removing $rvm_ruby_string environments..."
   environments="$rvm_environments_path/$rvm_ruby_string $(\ls -d "$rvm_environments_path"/* | awk '/'$rvm_ruby_string'@/')"
   for environment in $environments ; do
-    rm -rf "$environment"
+    \rm -rf "$environment"
   done ; unset environment environments
 }
 
@@ -973,7 +973,7 @@ __rvm_remove_aliases() {
 __rvm_remove_archives() {
   if [[ -n "$rvm_archive_flag" ]] ; then
     $rvm_scripts_path/log "info" "Removing $rvm_ruby_string archives..."
-    rm -f $rvm_archives_path/${rvm_ruby_package_file}.${rvm_archive_extension}
+    \rm -f $rvm_archives_path/${rvm_ruby_package_file}.${rvm_archive_extension}
   fi
 }
 
@@ -983,7 +983,7 @@ __rvm_remove_binaries() {
   for binary_name in $(\ls "$rvm_bin_path"); do
     full_binary_path="$rvm_bin_path/$binary_name"
     if [[ -L "$full_binary_path" ]] && $rvm_scripts_path/match "$(readlink "$full_binary_path")" "$rvm_ruby_string"; then
-      rm -f "$full_binary_path"
+      \rm -f "$full_binary_path"
     fi
     unset full_binary_path
   done; unset binary_name
@@ -996,9 +996,9 @@ __rvm_post_install() {
     for binary in $(echo $binaries) ; do
       if [[ -e "$rvm_ruby_home/bin/$binary" ]] || [[ -e "$rvm_ruby_src_path/bin/$binary" ]] ; then
         if [[ "$rvm_ruby_src_path" != "$rvm_ruby_home" ]] && [[ -f "$rvm_ruby_src_path/bin/$binary" ]] ; then
-          cp -f "$rvm_ruby_src_path/bin/$binary" "$rvm_ruby_home/bin/$binary"
+          \cp -f "$rvm_ruby_src_path/bin/$binary" "$rvm_ruby_home/bin/$binary"
         elif [[ -f "$rvm_ruby_gem_home/bin/$binary" ]] ; then
-          cp -f "$rvm_ruby_gem_home/bin/$binary" "$rvm_ruby_home/bin/$binary"
+          \cp -f "$rvm_ruby_gem_home/bin/$binary" "$rvm_ruby_home/bin/$binary"
         fi
         __rvm_inject_gem_env "$rvm_ruby_home/bin/$binary"
         __rvm_inject_ruby_shebang "$rvm_ruby_home/bin/$binary"
@@ -1046,7 +1046,7 @@ __rvm_rubygems_setup() {
     __rvm_inject_ruby_shebang "$rvm_ruby_src_path/bin/gem"
     __rvm_inject_gem_env "$rvm_ruby_home/bin/gem"
 
-    cp $rvm_ruby_src_path/bin/gem $rvm_ruby_home/bin/gem
+    \cp $rvm_ruby_src_path/bin/gem $rvm_ruby_home/bin/gem
 
     home="$GEM_HOME" ; path="$GEM_PATH" # Save
     for dir in $rvm_ruby_global_gems_path $rvm_ruby_gem_home ; do
@@ -1086,7 +1086,7 @@ __rvm_rubygems_setup() {
     # Sanity check... If setup.rb is missing from the rubygems source path,
     # something went wrong. Cleanup, aisle 3!
     if [[ ! -f "$rvm_src_path/$rvm_gem_package_name/setup.rb" ]]; then
-      rm -rf "$rvm_src_path/$rvm_gem_package_name"
+      \rm -rf "$rvm_src_path/$rvm_gem_package_name"
     fi
 
     if [[ ! -d "$rvm_src_path/$rvm_gem_package_name" ]] ; then
@@ -1095,7 +1095,7 @@ __rvm_rubygems_setup() {
       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
-      mkdir -p "$rvm_src_path/$rvm_gem_package_name"
+      \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 ..."
     fi
 
@@ -1120,8 +1120,8 @@ __rvm_rubygems_setup() {
 
   if [[ -n "$ruby_lib_gem_path" ]]; then
     # Add ruby's gem path to ruby's lib direcotry.
-    mkdir -p $(dirname $ruby_lib_gem_path)
-    if [[ -d "$ruby_lib_gem_path" ]] ; then rm -rf "$ruby_lib_gem_path" ; fi
+    \mkdir -p $(dirname $ruby_lib_gem_path)
+    if [[ -d "$ruby_lib_gem_path" ]] ; then \rm -rf "$ruby_lib_gem_path" ; fi
     ln -nfs "$rvm_ruby_gem_home" "$ruby_lib_gem_path"
   fi; unset ruby_lib_gem_path