rvm 0.1.45 → 0.1.46

data/scripts/update

@@ -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/utility

@@ -46,10 +46,10 @@ __rvm_dump_environment() {
   local dump_environment_type="$(echo "$rvm_dump_environment_flag" | awk -F, '{print $2}')"
   if [[ -n "$dump_environment_file" && -n "$dump_environment_type" ]]; then
     if [[ "$dump_environment_type" == "atheis"* ]]; then
-      rm -rf "$dump_environment_file" && ln -s /dev/null "$dump_environment_file" >/dev/null 2>&1
+      \rm -rf "$dump_environment_file" && ln -s /dev/null "$dump_environment_file" >/dev/null 2>&1
     else
       $rvm_scripts_path/environment-convertor "$dump_environment_type" "$(__rvm_environment_identifier)" > "$dump_environment_file"
-      [[ "$?" -gt 0 ]] && rm -rf "$dump_environment_file"
+      [[ "$?" -gt 0 ]] && \rm -rf "$dump_environment_file"
     fi
   fi
   unset rvm_dump_environment_flag
@@ -173,8 +173,8 @@ __rvm_run() {
     $rvm_scripts_path/log "debug" "Executing: $command"
   fi
 
-  mkdir -p "$(dirname "$rvm_ruby_log_path/$log_file_name.log")"
-  touch "$rvm_ruby_log_path/$log_file_name.log" "$rvm_ruby_log_path/$log_file_name.error.log" # for zsh :(
+  \mkdir -p "$(dirname "$rvm_ruby_log_path/$log_file_name.log")"
+  \touch "$rvm_ruby_log_path/$log_file_name.log" "$rvm_ruby_log_path/$log_file_name.error.log" # for zsh :(
   echo "[$(date +'%Y-%m-%d %H:%M:%S')] $command" | tee "$rvm_ruby_log_path/$log_file_name.log" >> "$rvm_ruby_log_path/$log_file_name.error.log"
   if [[ -z "$rvm_niceness" ]] || [[ "0" = "$rvm_niceness" ]] ; then
     eval "$command" >> "$rvm_ruby_log_path/$log_file_name.log" 2>> "$rvm_ruby_log_path/$log_file_name.error.log"
@@ -195,8 +195,8 @@ __rvm_run_with_env() {
     $rvm_scripts_path/log "debug" "Executing: $command in environment "$env_name""
   fi
 
-  mkdir -p "$(dirname "$rvm_ruby_log_path/$log_file_name.log")"
-  touch "$rvm_ruby_log_path/$log_file_name.log" "$rvm_ruby_log_path/$log_file_name.error.log" # for zsh :(
+  \mkdir -p "$(dirname "$rvm_ruby_log_path/$log_file_name.log")"
+  \touch "$rvm_ruby_log_path/$log_file_name.log" "$rvm_ruby_log_path/$log_file_name.error.log" # for zsh :(
   echo "[$(date +'%Y-%m-%d %H:%M:%S')] $command # under $env_name" | tee "$rvm_ruby_log_path/$log_file_name.log" >> "$rvm_ruby_log_path/$log_file_name.error.log"
   if [[ -z "$rvm_niceness" ]] || [[ "0" = "$rvm_niceness" ]] ; then
     eval "__rvm_with_env '$env_name' '$command'" >> "$rvm_ruby_log_path/$log_file_name.log" 2>> "$rvm_ruby_log_path/$log_file_name.error.log"
@@ -273,7 +273,7 @@ __rvm_inherit_trace_flag() {
 __rvm_cleanup_temp_for() {
   [[ -z "$1" ]] && return 1
   if [[ -d "$rvm_tmp_path/" ]]; then
-    rm -rf "$rvm_tmp_path/$1"* >/dev/null 2>&1
+    \rm -rf "$rvm_tmp_path/$1"* >/dev/null 2>&1
   fi
   exit
 }
@@ -360,13 +360,13 @@ __rvm_reset() {
   PATH="$(echo $PATH | \tr ':' '\n' | awk '$0 !~ /rvm/' | paste -sd : -)"
   PATH="$rvm_bin_path:$PATH" ; export PATH
 
-  for flag in default passenger editor ; do rm -f "$rvm_bin_path"/${flag}_* ; done
+  for flag in default passenger editor ; do \rm -f "$rvm_bin_path"/${flag}_* ; done
   unset flag
 
   for file in system default ; do
-    [[ -f "${rvm_path}/${file}" ]] && rm -f "$rvm_path/${file}"
-    [[ -f "${rvm_config_path}/${file}" ]] && rm -f "$rvm_config_path/${file}"
-    [[ -f "${rvm_environments_path}/${file}" ]] && rm -f "$rvm_environments_path/${file}"
+    [[ -f "${rvm_path}/${file}" ]] && \rm -f "$rvm_path/${file}"
+    [[ -f "${rvm_config_path}/${file}" ]] && \rm -f "$rvm_config_path/${file}"
+    [[ -f "${rvm_environments_path}/${file}" ]] && \rm -f "$rvm_environments_path/${file}"
   done; unset file
 
   # Go back to a clean state.
@@ -377,7 +377,7 @@ __rvm_reset() {
     $rvm_scripts_path/db "$rvm_config_path/user" "$system_config" "delete"
   done ; unset system_config variable
 
-  rm -f $rvm_bin_path/ruby $rvm_bin_path/gem $rvm_bin_path/rake $rvm_bin_path/irb $rvm_bin_path/default*
+  \rm -f $rvm_bin_path/ruby $rvm_bin_path/gem $rvm_bin_path/rake $rvm_bin_path/irb $rvm_bin_path/default*
 }
 
 # Implode removes the entire rvm installation under $rvm_path.
@@ -391,7 +391,7 @@ __rvm_implode() {
       else
         if [[ -d "$rvm_path" ]] ; then
           $rvm_scripts_path/log "info" "Hai! Removing $rvm_path"
-          rm -rf $rvm_path/
+          \rm -rf $rvm_path/
           echo "$rvm_path has been removed."
         else
           $rvm_scripts_path/log "info" "It appears that $rvm_path is already non existant."
@@ -423,11 +423,11 @@ __rvm_initialize() {
   __rvm_clean_path
 
   if echo "$PATH" | grep -q 'rvm\/bin:' ; then
-    PATH="$rvm_bin_path:$PATH"
+    PATH="${rvm_bin_path}:$PATH"
     export PATH
   fi
 
-  mkdir -p "$rvm_src_path" "$rvm_bin_path" "$rvm_archives_path" "$rvm_gems_path" "$rvm_tmp_path" "$rvm_repo_path"
+  \mkdir -p "$rvm_src_path" "$rvm_bin_path" "$rvm_archives_path" "$rvm_gems_path" "$rvm_tmp_path" "$rvm_repo_path"
 }
 
 # Update rubygems or binscripts based on CLI selection.
@@ -448,7 +448,7 @@ __rvm_update() {
 # Update rvm using rubygems
 # If --head was specified, update from git repository master branch.
 __rvm_update_rvm() {
-  mkdir -p "$rvm_src_path"
+  \mkdir -p "$rvm_src_path"
   __rvm_pushpop "$rvm_src_path"
 
   if [[ "$rvm_head_flag" == "1" ]] ; then
@@ -481,7 +481,7 @@ __rvm_reboot() {
     if [[ "/" = "$rvm_path" ]] ; then
       $rvm_scripts_path/log "error" "remove '/' ?!... NO!"
     else
-      if [[ -d "$rvm_path" ]] ; then rm -rf "$rvm_path/" ; fi
+      if [[ -d "$rvm_path" ]] ; then \rm -rf "$rvm_path/" ; fi
     fi
     gem install rvm $rvm_gem_options
     __rvm_update_rvm
@@ -494,7 +494,7 @@ __rvm_reboot() {
 # Create the irbrc for the currently selected ruby installation.
 __rvm_irbrc() {
   if [[ -d "$rvm_ruby_home" ]] && [[ ! -s "$rvm_ruby_irbrc" ]] ; then
-    cp $rvm_scripts_path/irbrc $rvm_ruby_irbrc
+    \cp $rvm_scripts_path/irbrc $rvm_ruby_irbrc
   fi
 }
 
@@ -593,14 +593,14 @@ __rvm_ensure_has_environment_files() {
 
   # Ensure system is a blank file.
   if [[ "$environment_identifier" == "system" ]]; then
-    rm -f "$file_name" 2>&1 | grep -v 'rm: cannot remove .* Permission denied'
-    mkdir -p "$(dirname "$file_name")"
-    touch "$file_name" 2>&1 | grep -v 'touch: cannot touch .* Permission denied'
+    \rm -f "$file_name" 2>&1 | grep -v 'rm: cannot remove .* Permission denied'
+    \mkdir -p "$(dirname "$file_name")"
+    \touch "$file_name" 2>&1 | grep -v 'touch: cannot touch .* Permission denied'
     return
   fi
 
   if [[ ! -s "$file_name" ]] ; then
-    mkdir -p "${rvm_environments_path}"
+    \mkdir -p "${rvm_environments_path}"
     echo "export PATH=\"${rvm_ruby_gem_home}/bin:${rvm_ruby_global_gems_path}/bin:${rvm_ruby_home}/bin:${rvm_bin_path}:\$PATH\"" > $file_name
     for variable in RUBY_VERSION GEM_HOME GEM_PATH BUNDLE_PATH MY_RUBY_HOME IRBRC rvm_ruby_string rvm_gemset_name MAGLEV_HOME ; do
       eval "export $variable"
@@ -620,7 +620,7 @@ __rvm_ensure_has_environment_files() {
     rvm_creating_default_wrappers=1
     directory_name="$rvm_wrappers_path/$wrapper_identifier"
     if [[ ! -L "$directory_name" && ! -d "$directory_name" ]]; then
-      mkdir -p "$directory_name"
+      \mkdir -p "$directory_name"
       $rvm_scripts_path/wrapper "$wrapper_identifier" &> /dev/null
     fi
     unset rvm_creating_default_wrappers directory_name
@@ -665,12 +665,13 @@ __rvm_project_rvmrc() {
   while : ; do
     if [[ -z "$cwd" ]] || [[ "$HOME" = "$cwd" ]] || [[ "/" = "$cwd" ]] ; then
       if [[ -n "$rvm_rvmrc_cwd" ]] ; then
-        if [[ -z "$rvm_previous_environment" ]] ; then
-          rvm default 1>/dev/null 2>&1
+        if [[ -f "$rvm_environments_path/$rvm_previous_environment" ]] ; then
+          . "$rvm_environments_path/$rvm_previous_environment"
         else
-          rvm "$rvm_previous_environment"  1>/dev/null 2>&1
-        fi
-        unset rvm_rvmrc_cwd rvm_previous_environment
+          if [[ -f "$rvm_environments_path/default" ]] ; then
+            . "$rvm_environments_path/default"
+          fi
+        fi ; unset rvm_rvmrc_cwd rvm_previous_environment
       fi
       break
     else
@@ -695,11 +696,11 @@ __rvm_record_install() {
   local recorded_ruby_name="$($rvm_scripts_path/tools strings "$1")"
   local rvm_install_record_file="$rvm_config_path/installs"
   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"
+  \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"
   echo "$rvm_install_command" >> "$rvm_install_record_file.tmp"
-  rm -f "$rvm_install_record_file"
+  \rm -f "$rvm_install_record_file"
   mv "$rvm_install_record_file.tmp" "$rvm_install_record_file"
 }
 
@@ -709,7 +710,7 @@ __rvm_remove_install_record() {
   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"
-    rm -f "$rvm_install_record_file.tmp"
+    \rm -f "$rvm_install_record_file.tmp"
   fi
 }
 
@@ -736,14 +737,16 @@ __rvm_environment_identifier() {
 
 __rvm_expand_ruby_string() {
   if [[ -z "$1" || "$1" = "all" || "$1" == "all-gemsets" ]]; then
-    $rvm_scripts_path/list gemsets strings
+    $rvm_scripts_path/list gemsets strings | __rvm_strip
+  elif [[ "$1" == "default-with-rvmrc" || "$1" == "rvmrc" ]]; then
+    $rvm_scripts_path/tools path-identifier "$(pwd)"
   elif [[ "$1" == "all-rubies" || "$1" == "rubies" ]]; then
-    $rvm_scripts_path/list strings | tr ' ' "\n"
+    $rvm_scripts_path/list strings | tr ' ' "\n" | __rvm_strip
   elif [[ "$1" == "current" || "$1" == "gemsets" ]]; then
     local current_ruby="$(__rvm_environment_identifier | awk -F"$rvm_gemset_separator" '{print $1}')"
-    rvm_silence_logging=1 $rvm_scripts_path/gemsets list | sed "s/^/$current_ruby$rvm_gemset_separator/"
+    rvm_silence_logging=1 $rvm_scripts_path/gemsets list | sed "s/^/$current_ruby$rvm_gemset_separator/"  | __rvm_strip
   elif [[ "$1" == "aliases" ]]; then
-    cat "$rvm_config_path/alias" | awk -F= '{print $1}'
+    cat "$rvm_config_path/alias" | awk -F= '{print $1}' | __rvm_strip
   else
     echo "$1" | tr "," "\n" | __rvm_strip
   fi

data/scripts/wrapper

@@ -11,8 +11,8 @@ full_binary_name() {
 }
 
 wrap() {
-  mkdir -p "$(dirname "$file_name")"
-  rm -f "$file_name"
+  \mkdir -p "$(dirname "$file_name")"
+  \rm -f "$file_name"
 
   echo "#!/usr/bin/env sh" > "$file_name"
   echo "if [ -s \"${rvm_environments_path}/${environment_identifier}\" ] ; then" >> "$file_name"
@@ -31,7 +31,7 @@ symlink_binary() {
   # We first check if we can wrap the binary and if we were able to,
   # we then symlink it into place.
   if wrap_binary && [[ -f "$file_name" ]]; then
-    rm -f "${rvm_bin_path}/${prefix}_${binary_name}"
+    \rm -f "${rvm_bin_path}/${prefix}_${binary_name}"
     ln -fs "$file_name" "${rvm_bin_path}/${prefix}_${binary_name}"
   fi
 }
@@ -98,7 +98,7 @@ for binary_name in $binaries; do
       else
         destination="$rvm_bin_path/${binary_name}-${environment_identifier}"
       fi
-      rm -rf "$destination"
+      \rm -rf "$destination"
       ln -nsf "$file_name" "$destination"
     fi; unset destination
   else

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rvm
 version: !ruby/object:Gem::Version 
-  hash: 65
+  hash: 71
   prerelease: false
   segments: 
   - 0
   - 1
-  - 45
-  version: 0.1.45
+  - 46
+  version: 0.1.46
 platform: ruby
 authors: 
 - Wayne E. Seguin
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-11 00:00:00 -04:00
+date: 2010-08-18 00:00:00 -04:00
 default_executable: rvm-install
 dependencies: []