rvm 0.1.44 → 0.1.45

data/README

@@ -91,6 +91,8 @@ Action
   notes     - Display notes, with operating system specifics.
 
   snapshot  - Let's your backup / restore an rvm installation in a lightweight manner.
+  
+  migrate   - Let's you migrate all gemsets from one ruby to another.
 
 Implementation
 

data/binscripts/rvm

@@ -17,40 +17,37 @@ fi
 [[ -z "$rvm_path" ]]   && unset rvm_path
 
 # Setup default sandbox value. See scripts/rvm for origin.
-if [[ -z "$rvm_sandboxed" ]]; then
+if [[ -z "$rvm_selfcontained" ]]; then
   if [[ "root" = "$(whoami)" ]] || [[ -n "$rvm_prefix" && "$rvm_prefix" != "$HOME"/* ]]; then
-    rvm_sandboxed=0
+    rvm_selfcontained=0
   else
-    rvm_sandboxed=1
+    rvm_selfcontained=1
   fi
 fi
 
 if [[ -z "$rvm_prefix" ]] ; then
-  if [[ "$rvm_sandboxed" = "0" ]] ; then
-    rvm_prefix="/usr/local"
+  if [[ "$rvm_selfcontained" = "0" ]] ; then
+    rvm_prefix="/usr/local/"
   else
     rvm_prefix="$HOME/."
   fi
 fi
 
-if [[ -z "$rvm_path" ]] ; then
-  unset rvm_path
-  if  [[ "$rvm_sandboxed" = "0" ]] ; then
-    rvm_path="$rvm_prefix/rvm"
-  else
-    if [[ -d "$HOME/.rvm" ]] && [[ -s "$HOME/.rvm/scripts/rvm" ]]; then
-      rvm_path="$HOME/.rvm"
-    elif [[ -d "$rvm_prefix/rvm" ]] && [[ -s "$rvm_prefix/rvm/scripts/rvm" ]] ; then
-      rvm_path="$rvm_prefix/rvm"
-    else
-      rvm_path="$HOME/.rvm"
-    fi
-  fi
+# Fix rvm_prefix changes.
+echo "$rvm_prefix" | grep -vq '\(\/\|\.\)$' && [[ -d "$rvm_prefix/rvm/scripts" ]]
+rvm_prefix_needs_trailing_slash="$?"
+if [[ "$rvm_prefix" = "/usr/local" || "$rvm_prefix_needs_trailing_slash" = "0" ]]; then
+  rvm_prefix="$rvm_prefix/"
 fi
+unset rvm_prefix_needs_trailing_slash
 
+if [[ -z "$rvm_path" ]] ; then
+  rvm_path="${rvm_prefix}rvm"
+fi
 rvm_scripts_path="${rvm_scripts_path:-"$rvm_path/scripts"}"
+
 source "$rvm_scripts_path/rvm"
 
 unset rvm_interactive
 
-rvm $*
+rvm "$@"

data/binscripts/rvm-update-head

@@ -6,12 +6,20 @@ if [[ -z "$rvm_ignore_rvmrc" ]]; then
 fi
 
 rvm_path="${rvm_path:-$HOME/.rvm}"
-mkdir -p $rvm_path/src/
-cd $rvm_path/src
 
-rm -rf ./rvm/ && git clone --depth 1 git://github.com/wayneeseguin/rvm.git
-cd rvm
-# v v v This is a godo idea however it does not preserve the executible bit.
-# Needs more thought, perhaps a simple sed instead.
+[ -d "$rvm_path/src" ] || mkdir -p $rvm_path/src/
+
+cd "$rvm_path/src"
+
+[ -d ./rvm ] && rm -rf ./rvm/
+
+git clone --depth 1 git://github.com/wayneeseguin/rvm.git ||
+  git clone http://github.com/wayneeseguin/rvm.git
+
+cd rvm &&
+
+# v v v This is a good idea however it does not preserve the executible bit.
+# Needs more thought, perhaps a simple sed instead...
 # dos2unix scripts/* >/dev/null 2>&1
+
 bash scripts/install

data/contrib/install-system-wide

@@ -19,14 +19,14 @@ if [[ -z "$rvm_ignore_rvmrc" ]]; then
 fi
 
 rvm_path="${rvm_path:-"/usr/local/rvm"}"
-export rvm_sandboxed=0
+export rvm_selfcontained=0
 
 mkdir -p "$rvm_path/src/"
 builtin cd "$rvm_path/src"
 
 rm -rf ./rvm/
 
-git clone --depth 1 git://github.com/wayneeseguin/rvm.git
+git clone --depth 1 git://github.com/wayneeseguin/rvm.git || git clone http://github.com/wayneeseguin/rvm.git
 
 builtin cd rvm
 
@@ -56,8 +56,8 @@ touch /etc/rvmrc
 cat > /etc/rvmrc <<END_OF_RVMRC
 # Setup default configuration for rvm.
 umask g+w
-export rvm_sandboxed=0
-export rvm_prefix="/usr/local"
+export rvm_selfcontained=0
+export rvm_prefix="/usr/local/"
 END_OF_RVMRC
 
 echo "Generating /usr/local/lib/rvm to load rvm"

data/install

@@ -1,10 +1,10 @@
 #!/usr/bin/env bash
 
-if [[ -z "$rvm_sandboxed" ]]; then
+if [[ -z "$rvm_selfcontained" ]]; then
   if [[ "root" = "$(whoami)" ]] || [[ -n "$rvm_prefix" && "$rvm_prefix" != "$HOME"/* ]]; then
-    export rvm_sandboxed=0
+    export rvm_selfcontained=0
   else
-    export rvm_sandboxed=1
+    export rvm_selfcontained=1
   fi
 fi
 
@@ -61,7 +61,7 @@ done
 
 if [[ -z "$rvm_prefix" ]] ; then
   __rvm_load_rvmrc
-  if [[ "$rvm_sandboxed" = "0" ]] ; then
+  if [[ "$rvm_selfcontained" = "0" ]] ; then
     rvm_prefix="${rvm_prefix:-"/usr/local/"}"
   else
     rvm_prefix="${rvm_prefix:-"$HOME/."}"
@@ -95,10 +95,14 @@ rvm_archives_path="${rvm_archives_path:-"$rvm_path/archives"}"
 rvm_src_path="${rvm_src_path:-"$rvm_path/src"}"
 rvm_log_path="${rvm_log_path:-"$rvm_path/log"}"
 
-if [[ -z "$rvm_prefix" ]] && [[ "root" = "$(whoami)" ]] ; then
-  rvm_bin_path="${rvm_bin_path:-"/usr/local/bin"}"
+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_rc_files="${rvm_rc_files:-"/etc/profile /etc/zshenv"}"
 else
+  rvm_man_path="${rvm_man_path:-"$rvm_path/man"}"
   rvm_bin_path="${rvm_bin_path:-"$rvm_path/bin"}"
+  rvm_rc_files="${rvm_rc_files:-"$HOME/.bash_profile $HOME/.bashrc $HOME/.zshenv"}"
 fi
 
 rvm_gems_path="${rvm_gems_path:-"$rvm_path/gems"}"
@@ -321,8 +325,8 @@ else
     printf "\n     [[ -s \$HOME/.rvm/scripts/rvm ]] && source \$HOME/.rvm/scripts/rvm"
     printf "\n   Please note that this must only occur once - so, you only need to add it the first time you install rvm."
     printf "\n2) Ensure that there is no 'return' from inside the .bashrc file. (otherwise rvm will be prevented from working properly)."
-    printf "\n   This means that if you see '[ -z "\$PS1" ] && return' then you must change this line to:"
-    printf "\n   if [[ -n "\$PS1" ]] ; then"
+    printf "\n   This means that if you see '[ -z \"\$PS1\" ] && return' then you must change this line to:"
+    printf "\n   if [[ -n \"\$PS1\" ]] ; then"
     printf "\n     ... original content that was below the && return line ..."
     printf "\n   fi # <= be sure to close the if."
     printf "\n   #EOF .bashrc"
@@ -331,10 +335,10 @@ else
     printf "\n   placing all non-interactive items in the .bashrc, including the 'source' line above"
     printf "\n3) Then $(tput setaf 1)CLOSE THIS SHELL$(tput sgr0) and open a new one in order to use rvm.\n"
   fi
-  if [[ -s $HOME/.bashrc ]] && grep -q '&& return' $HOME/.bashrc ; then
+  if [[ -s "$HOME/.bashrc" ]] && grep -q '&& return' "$HOME/.bashrc" ; then
     printf "\n\nWARNING:  you have a 'return' statement in your .bashrc, likely this will cause untold havoc."
-    printf "\n   This means that if you see '[ -z "\$PS1" ] && return' then you must change this line to:"
-    printf "\n   if [[ -n "\$PS1" ]] ; then"
+    printf "\n   This means that if you see '[ -z \"\$PS1\" ] && return' then you must change this line to:"
+    printf "\n   if [[ -n \"\$PS1\" ]] ; then"
     printf "\n     ... original content that was below the && return line ..."
     printf "\n   fi # <= be sure to close the if."
     printf "\n   #EOF .bashrc"

data/lib/VERSION.yml

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

data/rvm.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rvm}
-  s.version = "0.1.44"
+  s.version = "0.1.45"
 
   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-06}
+  s.date = %q{2010-08-11}
   s.default_executable = %q{rvm-install}
   s.description = %q{Manages Ruby interpreter environments and switching between them.}
   s.email = %q{wayneeseguin@gmail.com}
@@ -120,6 +120,7 @@ Gem::Specification.new do |s|
      "scripts/manpages",
      "scripts/match",
      "scripts/md5",
+     "scripts/migrate",
      "scripts/monitor",
      "scripts/notes",
      "scripts/package",
@@ -134,6 +135,7 @@ Gem::Specification.new do |s|
      "scripts/snapshot",
      "scripts/tools",
      "scripts/update",
+     "scripts/upgrade",
      "scripts/utility",
      "scripts/version",
      "scripts/wrapper"

data/scripts/alias

@@ -59,9 +59,13 @@ create_alias() {
   else
     if [[ -z "$rvm_alias" ]] ; then
       rvm_ruby_string="$rvm_environment_identifier"
-      rvm_expanding_aliases=1
-      __rvm_become
-      unset rvm_expanding_aliases
+      if [[ -z "$rvm_alias_expanded" ]]; then
+        rvm_expanding_aliases=1
+        __rvm_become
+        unset rvm_expanding_aliases
+      else
+        rvm_ruby_string="$rvm_environment_identifier"
+      fi
       if [[ -z "$rvm_ruby_string" ]]; then
         $rvm_scripts_path/log "error" "unknown ruby string specified"
         result=1

data/scripts/cli

@@ -42,7 +42,7 @@ __rvm_parse_args() {
       ;;
 
       use)
-        rvm_action=$rvm_token
+        rvm_action="$rvm_token"
         rvm_verbose_flag=1
         if [[ "ruby" = "$1" ]] ; then shift ; fi
       ;;
@@ -120,12 +120,6 @@ __rvm_parse_args() {
         rvm_parse_break=1
       ;;
 
-      docs|alias|rubygems)
-        rvm_action="$rvm_token"
-        rvm_ruby_args="$(__rvm_quote_args "$@")"
-        rvm_parse_break=1
-      ;;
-
       -S)
         rvm_action="ruby"
         rvm_ruby_args="$rvm_token $(__rvm_quote_args "$@")"
@@ -138,7 +132,7 @@ __rvm_parse_args() {
         rvm_parse_break=1
       ;;
 
-      exec|cleanup|tools|disk-usage|snapshot|repair)
+      docs|alias|rubygems|exec|cleanup|tools|disk-usage|snapshot|repair|migrate|upgrade)
         rvm_action="$rvm_token"
         rvm_ruby_args="$(__rvm_quote_args "$@")"
         rvm_parse_break=1
@@ -285,7 +279,7 @@ __rvm_parse_args() {
 
       --alias)
         if [[ -n "$1" ]]; then
-          export rvm_ruby_aliases="$(echo "$1" | \tr ',' ' ')"
+          export rvm_ruby_aliases="$(echo "$rvm_ruby_aliases $1" | \tr ',' ' ' | __rvm_strip)"
           shift
         fi
       ;;
@@ -348,6 +342,11 @@ __rvm_parse_args() {
         fi
       ;;
 
+      --with-rubies)
+        rvm_ruby_strings="$1"
+        shift
+      ;;
+
       -C|--configure)
         if [[ ! -z "$1" ]] ; then
           rvm_ruby_configure_flags="$(echo $1 | sed -e 's#,--# --#g')"
@@ -385,7 +384,7 @@ __rvm_parse_args() {
       --) rvm_ruby_args="$*" ; rvm_parse_break=1                ;;
 
       *)
-        if [[ ! -z "$rvm_token" ]] ; then
+        if [[ -n "$rvm_token" ]] ; then
           if [[ "gemset" = "$rvm_action" ]] ; then
             if $rvm_scripts_path/match "$rvm_token" "^.+${rvm_gemset_separator}.+$" ; then
               rvm_gemset_name="$(echo "$rvm_token" | awk -F${rvm_gemset_separator} '{print $2}')"
@@ -411,6 +410,10 @@ __rvm_parse_args() {
             rvm_gemset_name="$(echo "$rvm_token" | awk -F${rvm_gemset_separator} '{print $2}')"
             rvm_ruby_string="$(echo "$rvm_token" | awk -F${rvm_gemset_separator} '{print $1}')"
             rvm_ruby_strings="$rvm_token"
+          elif $rvm_scripts_path/match "$rvm_token" "^.+\\+.+$" ; then
+            rvm_ruby_alias="$(echo "$rvm_token" | awk -F+ '{print $2}')"
+            rvm_ruby_string="$(echo "$rvm_token" | awk -F+ '{print $1}')"
+            rvm_ruby_strings="$rvm_ruby_string"
           elif $rvm_scripts_path/match "$rvm_token" "-" ; then
             rvm_ruby_string="$rvm_token"
             rvm_ruby_strings="$rvm_token"
@@ -476,11 +479,11 @@ rvm() {
   __rvm_load_rvmrc
   __rvm_initialize
   __rvm_parse_args "$@"
-
   export BUNDLE_PATH GEM_HOME GEM_PATH rvm_ruby_string rvm_action rvm_bin_flag rvm_debug_flag rvm_delete_flag rvm_docs_type rvm_file_name rvm_gemset_name rvm_head_flag rvm_install_on_use_flag rvm_interactive rvm_llvm_flag rvm_make_flags rvm_proxy rvm_remove_flag rvm_ruby_args rvm_ruby_configure_flags rvm_ruby_file rvm_ruby_gem_home rvm_ruby_interpreter rvm_ruby_name rvm_ruby_version rvm_system_flag rvm_trace_flag rvm_use_flag rvm_user_flag rvm_verbose_flag rvm_patch_names rvm_patch_original_pwd rvm_clang_flag rvm_install_arguments
   export rvm_path rvm_rubies_path rvm_scripts_path rvm_archives_path rvm_src_path rvm_patches_path rvm_patches_path rvm_patchsets_path rvm_log_path rvm_bin_path rvm_gems_path rvm_config_path rvm_tmp_path rvm_hooks_path rvm_gems_cache_path rvm_gemset_separator
 
   result=0
+  
   case "$rvm_action" in
     use)             __rvm_use               ; result=$? ;;
     srcdir)          __rvm_source_dir        ; result=$? ;;
@@ -538,7 +541,7 @@ rvm() {
       unset old_rvm_ruby_string
     ;;
 
-    cleanup|tools|snapshot|disk-usage|repair|alias|docs|rubygems)
+    cleanup|tools|snapshot|disk-usage|repair|alias|docs|rubygems|migrate|upgrade)
       __rvm_run_script "$rvm_action"
       result=$?
     ;;

data/scripts/fetch

@@ -2,6 +2,7 @@
 
 rvm_base_except="selector"
 source "$rvm_scripts_path/base"
+result=0
 
 # Set it to cleanup the download on interruption.
 trap 'cleanup_download' 1 2 3 15
@@ -61,14 +62,19 @@ else
   download=1
 fi
 
+# try to convert the ftp url to a http url
+http_url="$(echo $url | sed -e 's/ftp:/http:/' -e 's/git:/http:/')"
+
 if [[ $download -gt 0 ]] ; then
   rm -f $archive
   eval $fetch_command "$url"
   result=$?
   if [[ $result -gt 0 ]] ; then
     retry=0
+    try_http=0
     if [[ $result -eq 78 ]] ; then
       $rvm_scripts_path/log "error" "The requested url does not exist: '$url'"
+      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"
@@ -78,7 +84,8 @@ if [[ $download -gt 0 ]] ; then
       rm -f "$archive"
       retry=1
     else
-      $rvm_scripts_path/log "error" "There was an error, please check $rvm_ruby_log_path/*.error.log"
+      $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."
+      try_http=1
     fi
 
     if [[ $retry -eq 1 ]] ; then
@@ -90,8 +97,20 @@ if [[ $download -gt 0 ]] ; then
         record_md5
       fi
     fi
+
+    if [[ $try_http -eq 1 ]] ; then
+      eval $fetch_command "$http_url"
+      result=$?
+      if [[ $result -gt 0 ]] ; then
+        $rvm_scripts_path/log "error" "There was an error, please check $rvm_ruby_log_path/*.error.log"
+      else
+        record_md5
+      fi
+    fi
+
   else
     record_md5
   fi
 fi
+
 exit $result

data/scripts/gemsets

@@ -176,14 +176,14 @@ gemset_copy() {
   fi
   
   if [[ -d "$source_path" ]] ; then
-    if [[ ! -d "$destination_path" ]] ; then mkdir -p $destination_path ; fi
+    [[ ! -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 ; do
+    for dir in bin doc gems specifications cache ; do
       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 "$destination_ruby" ; gemset_pristine)
+    __rvm_run_with_env "gemset.pristine" "$destination_ruby" "rvm gemset pristine"
   else
     $rvm_scripts_path/log "error" "Gems directory does not exist for $source_path ($source_path)"
     return 1
@@ -472,9 +472,9 @@ elif [[ "list" = "$action" ]] ; then
 elif [[ "gemdir" = "$action" ]] || [[ "gempath" = "$action" ]] || [[ "gemhome" = "$action" ]] || [[ "home" = "$action" ]] || [[ "path" = "$action" ]] || [[ "version" = "$action" ]] ; then
   gemset_info
 elif [[ "install" = "$action" ]] ; then
-  gem_install $*
+  gem_install "$@"
 elif [[ "pristine" = "$action" ]] ; then
-  gemset_pristine $*
+  gemset_pristine "$@"
 elif [[ "initial" = "$action" ]] ; then
   gemset_initial
 elif [[ "prune" = "$action" ]] ; then

data/scripts/info

@@ -95,7 +95,7 @@ info_debug() {
     fi
   done
 
-  if [[ "$rvm_sandboxed" = "0" ]] ; then
+  if [[ "$rvm_selfcontained" = "0" ]] ; then
     debug_files="$rvm_config_path/alias $rvm_config_path/system $rvm_config_path/db /etc/rvmrc /etc/gemrc"
   else
     debug_files="$rvm_config_path/alias $rvm_config_path/system $rvm_config_path/db $HOME/.rvmrc $HOME/.gemrc"

data/scripts/initialize

@@ -1,8 +1,8 @@
 #!/usr/bin/env bash
 
-rvm_sandboxed="${rvm_sandboxed:-1}"
+rvm_selfcontained="${rvm_selfcontained:-1}"
 
-if [[ "$rvm_sandboxed" = "0" ]] ; then
+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_rc_files="${rvm_rc_files:-"/etc/profile /etc/zshenv"}"
@@ -36,5 +36,5 @@ rvm_gemset_separator="${rvm_gemset_separator:-"@"}"
 rvm_project_rvmrc="${rvm_project_rvmrc:-1}"
 rvm_project_rvmrc_default="${rvm_project_rvmrc_default:-0}"
 
-export rvm_path rvm_patches_path rvm_rubies_path rvm_scripts_path rvm_archives_path rvm_src_path rvm_log_path rvm_bin_path rvm_gems_path rvm_config_path rvm_tmp_path rvm_hooks_path rvm_gems_cache_path rvm_gemset_separator rvm_gemsets_path rvm_repo_path rvm_patchsets_path rvm_sandboxed
+export rvm_path rvm_patches_path rvm_rubies_path rvm_scripts_path rvm_archives_path rvm_src_path rvm_log_path rvm_bin_path rvm_gems_path rvm_config_path rvm_tmp_path rvm_hooks_path rvm_gems_cache_path rvm_gemset_separator rvm_gemsets_path rvm_repo_path rvm_patchsets_path rvm_selfcontained
 

data/scripts/install

@@ -1,10 +1,10 @@
 #!/usr/bin/env bash
 
-if [[ -z "$rvm_sandboxed" ]]; then
+if [[ -z "$rvm_selfcontained" ]]; then
   if [[ "root" = "$(whoami)" ]] || [[ -n "$rvm_prefix" && "$rvm_prefix" != "$HOME"/* ]]; then
-    export rvm_sandboxed=0
+    export rvm_selfcontained=0
   else
-    export rvm_sandboxed=1
+    export rvm_selfcontained=1
   fi
 fi
 
@@ -61,7 +61,7 @@ done
 
 if [[ -z "$rvm_prefix" ]] ; then
   __rvm_load_rvmrc
-  if [[ "$rvm_sandboxed" = "0" ]] ; then
+  if [[ "$rvm_selfcontained" = "0" ]] ; then
     rvm_prefix="${rvm_prefix:-"/usr/local/"}"
   else
     rvm_prefix="${rvm_prefix:-"$HOME/."}"
@@ -95,10 +95,14 @@ rvm_archives_path="${rvm_archives_path:-"$rvm_path/archives"}"
 rvm_src_path="${rvm_src_path:-"$rvm_path/src"}"
 rvm_log_path="${rvm_log_path:-"$rvm_path/log"}"
 
-if [[ -z "$rvm_prefix" ]] && [[ "root" = "$(whoami)" ]] ; then
-  rvm_bin_path="${rvm_bin_path:-"/usr/local/bin"}"
+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_rc_files="${rvm_rc_files:-"/etc/profile /etc/zshenv"}"
 else
+  rvm_man_path="${rvm_man_path:-"$rvm_path/man"}"
   rvm_bin_path="${rvm_bin_path:-"$rvm_path/bin"}"
+  rvm_rc_files="${rvm_rc_files:-"$HOME/.bash_profile $HOME/.bashrc $HOME/.zshenv"}"
 fi
 
 rvm_gems_path="${rvm_gems_path:-"$rvm_path/gems"}"
@@ -321,8 +325,8 @@ else
     printf "\n     [[ -s \$HOME/.rvm/scripts/rvm ]] && source \$HOME/.rvm/scripts/rvm"
     printf "\n   Please note that this must only occur once - so, you only need to add it the first time you install rvm."
     printf "\n2) Ensure that there is no 'return' from inside the .bashrc file. (otherwise rvm will be prevented from working properly)."
-    printf "\n   This means that if you see '[ -z "\$PS1" ] && return' then you must change this line to:"
-    printf "\n   if [[ -n "\$PS1" ]] ; then"
+    printf "\n   This means that if you see '[ -z \"\$PS1\" ] && return' then you must change this line to:"
+    printf "\n   if [[ -n \"\$PS1\" ]] ; then"
     printf "\n     ... original content that was below the && return line ..."
     printf "\n   fi # <= be sure to close the if."
     printf "\n   #EOF .bashrc"
@@ -331,10 +335,10 @@ else
     printf "\n   placing all non-interactive items in the .bashrc, including the 'source' line above"
     printf "\n3) Then $(tput setaf 1)CLOSE THIS SHELL$(tput sgr0) and open a new one in order to use rvm.\n"
   fi
-  if [[ -s $HOME/.bashrc ]] && grep -q '&& return' $HOME/.bashrc ; then
+  if [[ -s "$HOME/.bashrc" ]] && grep -q '&& return' "$HOME/.bashrc" ; then
     printf "\n\nWARNING:  you have a 'return' statement in your .bashrc, likely this will cause untold havoc."
-    printf "\n   This means that if you see '[ -z "\$PS1" ] && return' then you must change this line to:"
-    printf "\n   if [[ -n "\$PS1" ]] ; then"
+    printf "\n   This means that if you see '[ -z \"\$PS1\" ] && return' then you must change this line to:"
+    printf "\n   if [[ -n \"\$PS1\" ]] ; then"
     printf "\n     ... original content that was below the && return line ..."
     printf "\n   fi # <= be sure to close the if."
     printf "\n   #EOF .bashrc"