rvm 0.1.45 → 0.1.46

data/scripts/migrate

@@ -29,7 +29,7 @@ expand_ruby_name() {
 migrate_rubies() {
   expanded_source="$(expand_ruby_name "$source_ruby")"
   expanded_destination="$(expand_ruby_name "$destination_ruby")"
-  
+
   if [[ -z "$expanded_source" ]]; then
     die_with_error "Could not expand source ruby '$source_ruby'"
   elif [[ -z "$expanded_destination" ]]; then
@@ -41,12 +41,12 @@ migrate_rubies() {
   elif [[ ! -d "$rvm_rubies_path/$expanded_destination" ]]; then
     die_with_error "Ruby '$expanded_destination' is not installed - please install it first."
   fi
-  
+
   echo "Are you sure you wish to MOVE gems from $expanded_source to $expanded_destination?"
   confirm "This will overwrite existing gems in $expanded_destination and remove them from $expanded_source" || return 1
-  
+
   echo "Moving gemsets..."
-  
+
   while read -r origin_gemset; do
     [[ "$origin_gemset" = "$expanded_source" || "$origin_gemset" = "$expanded_source$rvm_gemset_separator"* ]] || continue
     gemset_name="$(echo "$origin_gemset" | awk -F"$rvm_gemset_separator" '{print $2}')"
@@ -55,21 +55,21 @@ migrate_rubies() {
       destination_gemset="$destination_gemset$rvm_gemset_separator$gemset_name"
     fi
     echo "Moving $origin_gemset to $destination_gemset"
-  
-    rm -rf "$rvm_gems_path/$destination_gemset"
+
+    \rm -rf "$rvm_gems_path/$destination_gemset"
     result="$?"
     [[ "$result" -gt "0" ]] && die_with_error "Unable to remove gem directory '$rvm_gems_path/$destination_gemset'" "$result"
-    
+
     mv "$rvm_gems_path/$origin_gemset" "$rvm_gems_path/$destination_gemset"
     result="$?"
     [[ "$result" -gt "0" ]] && die_with_error "Unable to move '$rvm_gems_path/$origin_gemset' to '$rvm_gems_path/$destination_gemset'" "$result"
-    
-    
+
+
     echo "Making gemset $destination_gemset pristine."
     __rvm_run_with_env "gemset.pristine" "$destination_gemset" "rvm gemset pristine"
   done < <($rvm_scripts_path/list gemsets strings | grep "^$expanded_source")
   unset origin_gemset destination_gemset gemset_name
-  
+
   if confirm 'Do you wish to move over aliases?' ; then
     while read -r alias_pair; do
       migrate_ruby_name="$(echo "$alias_pair" | awk -F= '{print $2}')"
@@ -83,7 +83,7 @@ migrate_rubies() {
     done < "$rvm_config_path/alias"
     unset migrate_ruby_name migrate_alias_name migrate_new_alias_name
   fi
-  
+
   if confirm "Do you wish to move over wrappers?" ; then
     origin_wrappers_path="$rvm_wrappers_path/$expanded_source"
     for binary_name in $(\ls $rvm_bin_path) ; do
@@ -98,13 +98,13 @@ migrate_rubies() {
     done
     unset origin_wrappers_path full_bin_path expanded_symlink linked_binary_name new_wrapper_destination
   fi
- 
+
   if confirm "Do you also wish to completely remove $expanded_source (inc. archive)?" ; then
     __rvm_run_with_env "rvm.remove" "$expanded_source" "rvm remove $expanded_source --archive --gems"
   fi
-  
+
   echo "Successfully migrated $expanded_source to $expanded_destination"
-  
+
 }
 
 if [[ -z "$1" || "$#" != 2 ]]; then
@@ -114,4 +114,4 @@ fi
 source_ruby="$1"; shift
 destination_ruby="$1"; shift
 
-migrate_rubies
+migrate_rubies

data/scripts/monitor

@@ -27,7 +27,7 @@ push_if_timestamp_changed() {
 
 update_timestamp() {
   if [[ -d "${1}/" ]] ; then
-    touch "$rvm_path/${$}_${1}_timestamp"
+    \touch "$rvm_path/${$}_${1}_timestamp"
     eval "${1}_timestamp=\$(timestamp \"$rvm_path/${$}_${1}_timestamp\")"
   fi
 }

data/scripts/package

@@ -44,7 +44,7 @@ install_package() {
     __rvm_run "$package/make.install" "/usr/bin/make install" "Installing $package to $rvm_usr_path"
   fi
 
-  touch "$rvm_config_path/packages"
+  \touch "$rvm_config_path/packages"
   $rvm_scripts_path/db "$rvm_config_path/packages" "${package}" "${version}"
 
   __rvm_pushpop
@@ -167,7 +167,7 @@ llvm() {
   __rvm_pushpop $rvm_src_path
   if [[ ! -d "$rvm_src_path/llvm/.svn" ]] ; then
     __rvm_db "${package}_url" "package_url"
-    rm -rf "$rvm_src_path/llvm"
+    \rm -rf "$rvm_src_path/llvm"
     svn co -r "$version" "$package_url" llvm
     builtin cd "$rvm_src_path/llvm"
     ./configure --enable-bindings=none

data/scripts/repair

@@ -15,7 +15,7 @@ repair_symlinks() {
     [[ -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")"
-      rm -f "$executable_name"
+      \rm -f "$executable_name"
     fi
   done; unset executable_name
   __rvm_pushpop
@@ -26,7 +26,7 @@ repair_environments() {
   for environment_name in $(\ls "$rvm_environments_path"); do
     [[ -L "$rvm_environments_path/$environment_name" ]] && continue
     $rvm_scripts_path/log "info" "Regenerating environment file for '$environment_name'"
-    [[ -f "$rvm_environments_path/$environment_name" ]] && rm -f "$rvm_environments_path/$environment_name"
+    [[ -f "$rvm_environments_path/$environment_name" ]] && \rm -f "$rvm_environments_path/$environment_name"
     (source "$rvm_scripts_path/base"; __rvm_become "$environment_name"; __rvm_ensure_has_environment_files)
   done; unset environment_name
 }
@@ -38,7 +38,7 @@ repair_archives() {
     local stored_md5sum="$($rvm_scripts_path/db "$rvm_config_path/md5" "$archive_file" | head -n1)"
     if [[ -n "$stored_md5sum" ]] && ! $rvm_scripts_path/md5 "$rvm_archives_path/$archive_file" "$stored_md5sum" ; then
       $rvm_scripts_path/log "info" "Removing archive for '$archive_file' - Incorrect md5 checksum."
-      rm -rf "$rvm_archives_path/$archive_file"
+      \rm -rf "$rvm_archives_path/$archive_file"
     fi
   done; unset archive_file
 }

data/scripts/rubygems

@@ -27,7 +27,7 @@ rubygems_setup() {
     rubygems_dir="$(ruby -rrbconfig -e "puts Config::CONFIG.values_at('sitelibdir','vendorlibdir').detect {|path| File.directory?(File.join(path, 'rubygems')) }.to_s")"
     if [[ -n "$rubygems_dir" && -d "$rubygems_dir" ]]; then
       # Remove common files installed by ruby gems.
-      rm -rf "${rubygems_dir}/ubygems.rb" "${rubygems_dir}/rubygems.rb" "${rubygems_dir}/rubygems" "${rubygems_dir}/gauntlet_rubygems.rb"
+      \rm -rf "${rubygems_dir}/ubygems.rb" "${rubygems_dir}/rubygems.rb" "${rubygems_dir}/rubygems" "${rubygems_dir}/gauntlet_rubygems.rb"
     fi
 
     $rvm_scripts_path/log "info" "Installing rubygems dedicated to $rvm_ruby_string..."
@@ -39,7 +39,7 @@ 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
@@ -48,7 +48,7 @@ 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
 
@@ -70,9 +70,9 @@ rubygems_setup() {
   fi
 
   # Add ruby's gem path to ruby's lib direcotry.
-  mkdir -p "$(dirname $ruby_lib_gem_path)"
+  \mkdir -p "$(dirname $ruby_lib_gem_path)"
 
-  if [[ -d "$ruby_lib_gem_path" ]] ; then rm -rf "$ruby_lib_gem_path" ; fi
+  if [[ -d "$ruby_lib_gem_path" ]] ; then \rm -rf "$ruby_lib_gem_path" ; fi
 
   ln -nfs "$rvm_ruby_gem_home" "$ruby_lib_gem_path"
 
@@ -89,7 +89,7 @@ fi
 #
 if [[ $# -gt 0 ]] ; then
   version="$1" ; shift
-  args="$(echo "$@" | __rvm_strip)" 
+  args="$(echo "$@" | __rvm_strip)"
 else
   $rvm_scripts_path/log "error" "A version must be specified, for example 'rvm rubygems 1.3.7'"
   exit 1

data/scripts/rvm

@@ -2,7 +2,7 @@
 
 # rvm : Ruby enVironment Manager
 # http://rvm.beginrescueend.com
-# http://gitub.com/wayneeseguin/rvm
+# http://github.com/wayneeseguin/rvm
 
 rvm_reload_flag="${rvm_reload_flag:-0}"
 rvm_loaded_flag="${rvm_loaded_flag:-0}"

data/scripts/rvm-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/selector

@@ -210,7 +210,7 @@ __rvm_select() {
 
     rvm_ruby_selected_flag=1
 
-    mkdir -p "$rvm_ruby_log_path"
+    \mkdir -p "$rvm_ruby_log_path"
 
     export rvm_ruby_interpreter rvm_ruby_version rvm_ruby_repo_url rvm_ruby_package_name rvm_url rvm_ruby_patch_level rvm_ruby_configure rvm_ruby_configure_flags rvm_ruby_make rvm_ruby_make_install rvm_ruby_revision rvm_ruby_tag rvm_release_version rvm_major_version rvm_minor_version rvm_gemset_name rvm_gems_path rvm_ruby_gem_home rvm_path rvm_src_path rvm_bin_path rvm_ruby_binary rvm_ruby_home rvm_log_path rvm_ruby_log_path rvm_src_path rvm_ruby_src_path rvm_ruby_irbrc rvm_ruby_selected_flag rvm_ruby_string
   else
@@ -219,7 +219,7 @@ __rvm_select() {
 }
 
 __rvm_use() {
-  
+
   if [[ -z "$rvm_ruby_selected_flag" ]] ; then __rvm_select "$@" ; fi
   if [[ -z "$rvm_ruby_interpreter" ]] ; then rvm_ruby_interpreter="system" ; fi
 
@@ -231,7 +231,7 @@ __rvm_use() {
     if [[ -s $rvm_config_path/system ]] ; then
       grep "MY_RUBY_HOME='$rvm_rubies_path" "$rvm_config_path/system" > /dev/null
       if [[ $? -eq 0 ]] ; then
-        [[ -f "$rvm_config_path/system" ]] && rm -f $rvm_config_path/system # 'system' should *not* point to an rvm ruby.
+        [[ -f "$rvm_config_path/system" ]] && \rm -f $rvm_config_path/system # 'system' should *not* point to an rvm ruby.
       else
         source "$rvm_config_path/system"
       fi
@@ -241,7 +241,7 @@ __rvm_use() {
     if [[ "$rvm_selfcontained" = "0" ]] ; then
       for binary in ruby gem irb ri rdoc rake erb testrb ; do
         full_binary_path="$rvm_bin_path/$binary"
-        [[ -L "$full_binary_path" ]] && rm -f "$full_binary_path"
+        [[ -L "$full_binary_path" ]] && \rm -f "$full_binary_path"
       done; unset binary full_binary_path
     fi
 
@@ -299,10 +299,10 @@ __rvm_use() {
     fi
     if [[ "system" = "$rvm_ruby_interpreter" ]] ; then
       $rvm_scripts_path/alias delete default &> /dev/null
-      rm -f $rvm_bin_path/default*
-      [[ -f $rvm_config_path/default ]] && rm -f $rvm_config_path/default
-      [[ -f $rvm_environments_path/default ]] && rm -f $rvm_environments_path/default
-      [[ -f $rvm_wrappers_path/default ]] && rm -f $rvm_wrappers_path/default
+      \rm -f $rvm_bin_path/default*
+      [[ -f $rvm_config_path/default ]] && \rm -f $rvm_config_path/default
+      [[ -f $rvm_environments_path/default ]] && \rm -f $rvm_environments_path/default
+      [[ -f $rvm_wrappers_path/default ]] && \rm -f $rvm_wrappers_path/default
     else
       RUBY_VERSION="$($rvm_ruby_home/bin/ruby -v | sed 's#^\(.*\) (.*$#\1#')"
       export GEM_HOME GEM_PATH BUNDLE_PATH MY_RUBY_HOME RUBY_VERSION
@@ -556,11 +556,11 @@ __rvm_gemset_select() {
   rvm_ruby_gem_path="$rvm_ruby_gem_home:$rvm_ruby_global_gems_path"
 
   # Ensure that the ruby gem home exists.
-  mkdir -p "$rvm_ruby_gem_home"
+  \mkdir -p "$rvm_ruby_gem_home"
   if [[ -n "$rvm_ruby_gem_home" ]] && echo "$rvm_ruby_gem_home" | grep -q 'rvm'; then
     if __rvm_using_gemset_globalcache && [[ ! -L "$rvm_ruby_gem_home/cache" ]]; then
       mv "$rvm_ruby_gem_home/cache/"*.gem "$rvm_gems_cache_path/" 2>/dev/null
-      rm -rf "$rvm_ruby_gem_home/cache"
+      \rm -rf "$rvm_ruby_gem_home/cache"
       ln -nfs "$rvm_gems_cache_path" "$rvm_ruby_gem_home/cache"
     fi
   fi

data/scripts/set

@@ -12,11 +12,12 @@ args="$*"
 
 __rvm_attempt_single_exec() {
   # Return if we have multiple rubies. or we're not running exec.
-  if [[ "$action" != "exec" ]] || $rvm_scripts_path/match "$rvm_ruby_strings" ' '; then
-    return 1
+  local ruby_string_lines="$(printf "$rvm_ruby_strings" | wc -l | __rvm_strip)"
+  if [[ "$action" = "exec" && -n "$rvm_ruby_strings" && "$ruby_string_lines" = "0" ]]; then
+    __rvm_become "$rvm_ruby_strings"
+    eval "exec $args"
   fi
-  __rvm_become "$rvm_ruby_strings"
-  eval "exec $args"
+  return 1
 }
 
 # Perform an action using one of a selected ruby's specified binaries.
@@ -63,8 +64,8 @@ __rvm_ruby_do() {
   fi
 
   if [[ ! -z "$rvm_json_flag" ]] || [[ ! -z "$rvm_yaml_flag" ]] || [[ ! -z "$rvm_summary_flag" ]] ; then
-    mkdir -p ./log/$rvm_ruby_string/
-    touch ./log/$rvm_ruby_string/$action.log ./log/$rvm_ruby_string/$action.error.log
+    \mkdir -p ./log/$rvm_ruby_string/
+    \touch ./log/$rvm_ruby_string/$action.log ./log/$rvm_ruby_string/$action.error.log
     eval "$rvm_command" >> ./log/$rvm_ruby_string/$action.log 2>> ./log/$rvm_ruby_string/$action.error.log
   else
     if [[ "$rvm_verbose_flag" != "0" ]] ; then
@@ -123,7 +124,7 @@ __rvm_yaml() {
     fi
     yaml="$yaml\n  \"${rubies[$index]}\": ${statuses[$index]}"
   done ; unset index array_start
-  mkdir -p log
+  \mkdir -p log
   printf "$yaml" | tee -a log/summary.yaml
 
   return ${#errors[*]}
@@ -148,7 +149,7 @@ __rvm_json() {
   done ; unset index array_start
   json="$json\n  }\n}"
 
-  mkdir -p log
+  \mkdir -p log
   printf "$json" | tee -a log/summary.json
 
   return ${#errors[*]}

data/scripts/snapshot

@@ -24,20 +24,20 @@ snapshot_save() {
 
   # Create the temporary directory.
   local snapshot_temp_path="$rvm_tmp_path/$$-snapshot"
-  rm -rf "$snapshot_temp_path"
-  mkdir -p "$snapshot_temp_path"
+  \rm -rf "$snapshot_temp_path"
+  \mkdir -p "$snapshot_temp_path"
 
   $rvm_scripts_path/log "info" "Backing up a list of aliases"
-  cp "$rvm_config_path/alias" "$snapshot_temp_path/"
+  \cp "$rvm_config_path/alias" "$snapshot_temp_path/"
 
   $rvm_scripts_path/log "info" "Backing up your user preferences"
-  cp "$rvm_config_path/user" "$snapshot_temp_path/"
+  \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"
 
   $rvm_scripts_path/log "info" "Backing up all of your gemsets"
-  mkdir -p "$snapshot_temp_path/gems"
+  \mkdir -p "$snapshot_temp_path/gems"
   __rvm_pushpop "$snapshot_temp_path/gems"
   for snapshot_gemset in $($rvm_scripts_path/list gemsets strings) ; do
     __rvm_become "$snapshot_gemset"
@@ -46,8 +46,8 @@ snapshot_save() {
     $rvm_scripts_path/gemsets export "${snapshot_gemset}.gems" >/dev/null
     result="$?"
     __error_on_result "$result" "Error exporting gemset contents for $snapshot_gemset" && return "$result"
-    mkdir -p "./$snapshot_gemset/"
-    [[ -d "$GEM_HOME/cache/" ]] && cp -R "$GEM_HOME/cache/" "./$snapshot_gemset/"
+    \mkdir -p "./$snapshot_gemset/"
+    [[ -d "$GEM_HOME/cache/" ]] && \cp -R "$GEM_HOME/cache/" "./$snapshot_gemset/"
   done; unset snapshot_gemset
   __rvm_pushpop
 
@@ -61,7 +61,7 @@ snapshot_save() {
   $rvm_scripts_path/alias list | awk -F ' => ' '{print $1}' | sort | uniq 2>/dev/null > "$snapshot_alias_name_file"
   $rvm_scripts_path/list strings | \tr ' ' '\n' | sort | uniq > "$snapshot_ruby_name_file"
   comm -2 -3 "$snapshot_ruby_name_file" "$snapshot_alias_name_file" > "$snapshot_installable_file"
-  rm -rf "$snapshot_ruby_name_file" "$snapshot_alias_name_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")"
@@ -76,19 +76,19 @@ snapshot_save() {
     unset snapshot_install_command
   done; unset snapshot_ruby_name snapshot_primary_ruby
 
-  rm -rf "$snapshot_installable_file"
+  \rm -rf "$snapshot_installable_file"
 
   $rvm_scripts_path/log "info" "Compressing snapshotting"
   local destination_path="$PWD"
   __rvm_pushpop "$snapshot_temp_path"
-  rm -rf "$destination_path/$1.tar.gz"
+  \rm -rf "$destination_path/$1.tar.gz"
   tar czf "$destination_path/$1.tar.gz" .
   result="$?"
   __error_on_result "$result" "Error creating archive $destination_path/$1.tar.gz" && return "$result"
   __rvm_pushpop
 
   $rvm_scripts_path/log "info" "Cleaning up"
-  rm -rf "$snapshot_temp_path"
+  \rm -rf "$snapshot_temp_path"
 
   $rvm_scripts_path/log "info" "Snapshot complete"
 
@@ -110,8 +110,8 @@ snapshot_load() {
 
   local snapshot_temp_path="$rvm_tmp_path/$$-snapshot"
 
-  rm -rf "$snapshot_temp_path"
-  mkdir -p "$snapshot_temp_path"
+  \rm -rf "$snapshot_temp_path"
+  \mkdir -p "$snapshot_temp_path"
 
   $rvm_scripts_path/log "info" "Extracting snapshot"
   __rvm_pushpop "$snapshot_temp_path"
@@ -121,7 +121,7 @@ snapshot_load() {
   __rvm_pushpop
 
   $rvm_scripts_path/log "info" "Restoring user settings"
-  cp -f "$snapshot_temp_path/user" "$rvm_config_path/user"
+  \cp -f "$snapshot_temp_path/user" "$rvm_config_path/user"
 
   $rvm_scripts_path/log "info" "Installing rvm-managed packages"
   for snapshot_package in $(cat "$snapshot_temp_path/packages"); do
@@ -143,8 +143,8 @@ snapshot_load() {
     __rvm_become "$snapshot_gemset"
     result="$?"
     __error_on_result "$result" "Error becoming '$snapshot_gemset'" && return "$result"
-    mkdir -p "$GEM_HOME/cache/"
-    cp -Rf "$snapshot_gemset/" "$GEM_HOME/cache/"
+    \mkdir -p "$GEM_HOME/cache/"
+    \cp -Rf "$snapshot_gemset/" "$GEM_HOME/cache/"
     result="$?"
     __error_on_result "$result" "Error copying across cache for $snapshot_gemset" && return "$result"
     $rvm_scripts_path/gemsets import "$snapshot_gemset" >/dev/null 2>&1
@@ -167,7 +167,7 @@ snapshot_load() {
   unset package_info
 
   $rvm_scripts_path/log "info" "Cleaning up load process"
-  rm -rf "$snapshot_temp_path"
+  \rm -rf "$snapshot_temp_path"
 
   $rvm_scripts_path/log "info" "Loaded snapshot from $(basename "$snapshot_archive")"
 }