rvm 0.1.32 → 0.1.33

data/scripts/selector

@@ -194,6 +194,7 @@ __rvm_select() {
 
   if [[ ! -z "$rvm_ruby_interpreter" ]] && [[ "system" != "$rvm_ruby_interpreter" ]]  && [[ "default" != "$rvm_ruby_interpreter" ]] ; then
     if [[ ! -z "$rvm_ruby_version" ]] ; then
+      rvm_release_version=$(echo $rvm_ruby_version | awk -F'.' '{ print $1 }')
       rvm_major_version=$(echo $rvm_ruby_version | awk -F'.' '{ print $2 }')
       rvm_minor_version=$(echo $rvm_ruby_version | awk -F'.' '{ print $3 }')
     fi
@@ -205,6 +206,7 @@ __rvm_select() {
     rvm_ruby_binary="$rvm_ruby_home/bin/ruby"
     rvm_ruby_irbrc="$rvm_ruby_home/.irbrc"
     rvm_ruby_gem_home="${rvm_gems_path}/${rvm_ruby_string}"
+    rvm_ruby_gem_path="${rvm_ruby_gem_home}:${rvm_ruby_gem_home}@global"
 
     if [[ "maglev" = "$rvm_ruby_interpreter" ]] ; then
       export MAGLEV_HOME="$rvm_ruby_home"
@@ -213,13 +215,14 @@ __rvm_select() {
 
     if [[ ! -z "$rvm_gemset_name" ]] ; then
       rvm_ruby_gem_home="${rvm_ruby_gem_home}${rvm_gemset_separator}${rvm_gemset_name}"
+      rvm_ruby_gem_path="${rvm_ruby_gem_home}:${rvm_gems_path}/${rvm_ruby_string}${rvm_gemset_separator}global"
     fi
 
     rvm_ruby_selected_flag=1
 
     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_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
+    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
     rvm_ruby_interpreter="${rvm_ruby_interpreter:-system}"
   fi
@@ -228,27 +231,9 @@ __rvm_select() {
 
 __rvm_use() {
   if [[ -z "$rvm_ruby_selected_flag" ]] ; then __rvm_select $* ; fi
-  if [[ -z "$rvm_ruby_interpreter" ]] ; then rvm_ruby_interpreter="default" ; fi
+  if [[ -z "$rvm_ruby_interpreter" ]] ; then rvm_ruby_interpreter="system" ; fi
 
-  if [[ "default" = "$rvm_ruby_interpreter" ]] ; then
-
-    new_path="$(echo $PATH | tr ':' '\n' | awk '$0 !~ /rvm/' | paste -sd : -)"
-    new_path="$rvm_bin_path:$new_path"
-
-    if [[ -s $rvm_config_path/default ]] ; then
-      unset new_path
-      source $rvm_config_path/default
-      if [[ ! -z "$rvm_verbose_flag" ]] ; then
-        $rvm_scripts_path/log "info" "Now using default ruby."
-      fi
-    else
-      rvm_ruby_interpreter="system"
-      $rvm_scripts_path/log "warn" "no default rvm specified, defaulting to pre-rvm system."
-      unset GEM_HOME GEM_PATH BUNDLE_PATH MY_RUBY_HOME RUBY_VERSION IRBRC
-      if [[ -s $rvm_config_path/system ]] ; then source $rvm_config_path/system ; fi
-    fi
-
-  elif [[ "system" = "$rvm_ruby_interpreter" ]] ; then
+  if [[ "system" = "$rvm_ruby_interpreter" ]] ; then
 
     unset GEM_HOME GEM_PATH BUNDLE_PATH MY_RUBY_HOME RUBY_VERSION IRBRC
     new_path="$(echo $PATH | tr ':' '\n' | awk '$0 !~ /rvm/' | paste -sd : -)"
@@ -263,8 +248,8 @@ __rvm_use() {
     fi
 
     if [[ "root" = "$(whoami)" ]] ; then
-      for binary in erb gem irb rake rdoc ri ruby testrb ; do
-        rm -f $rvm_symlink_path/$binary
+      for binary in ruby gem irb ri rdoc rake erb testrb ; do
+        rm -f "$rvm_bin_path/$binary"
       done
     fi
 
@@ -296,6 +281,9 @@ __rvm_use() {
       fi
     fi
 
+    # Ensure the environment file for the selected ruby exists.
+    __rvm_ensure_has_enviroment_files
+
     if [[ ! -z "$rvm_verbose_flag" ]] ; then
       $rvm_scripts_path/log "info" "Using $(basename $GEM_HOME | tr '-' ' ' | sed 's/'${rvm_gemset_separator}'/ with gemset /')"
     fi
@@ -306,46 +294,37 @@ __rvm_use() {
 
   if [[ ! -z "$rvm_default_flag" ]] && [[ "default" != "$rvm_ruby_interpreter" ]] ; then
     if [[ "root" = "$(whoami)" ]] ; then
-      for binary in erb gem irb rake rdoc ri ruby testrb ; do
-        rm -f $rvm_symlink_path/$binary
-        ln -nfs $rvm_ruby_home/bin/$binary $rvm_symlink_path/$binary
-        rm -f $rvm_symlink_path/passenger_ruby
-        ln -nfs $rvm_bin_path/$rvm_ruby_string $rvm_symlink_path/passenger_ruby
-      done
+      # By not providing the name it uses the base ruby binary names.
+      $rvm_scripts_path/wrapper $rvm_ruby_string
     fi
-
+    local environment_id="$(__rvm_environment_identifier)"
     if [[ "system" = "$rvm_ruby_interpreter" ]] ; then
+      $rvm_scripts_path/alias delete default &> /dev/null
       rm -f $rvm_config_path/default
       rm -f $rvm_bin_path/default*
+      rm -f $rvm_environments_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
-
-      echo "export PATH=\"$rvm_ruby_gem_home/bin:$rvm_ruby_global_gems_path/bin:$rvm_ruby_home/bin:$rvm_bin_path:\$PATH\"" > $rvm_config_path/default
-
-      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"
-        eval value=\$${variable}
-        if [[ ! -z "$value" ]] ; then
-          echo "export ${variable}='$value'" >> $rvm_config_path/default
-        else
-          echo "unset ${variable}" >> $rvm_config_path/default
-        fi
-      done ; unset variable value
-
-      if [[ ! -z "$rvm_default_flag" ]] ; then $rvm_scripts_path/symlink "default" ; fi
+      # Delete + then create the default alias.
+      $rvm_scripts_path/alias delete default &> /dev/null
+      $rvm_scripts_path/alias create default "$environment_id" >& /dev/null
+      ln -nfs $rvm_environments_path/$environment_id $rvm_environments_path/default
+      ln -nfs $rvm_wrappers_path/$environment_id $rvm_wrappers_path/default
     fi
+  fi ; unset rvm_default_flag
+
+  if [[ ! -z "$rvm_wrapper_name" ]] ; then
+    $rvm_scripts_path/wrapper "$rvm_ruby_string" "$rvm_wrapper_name" > /dev/null 2>&1
+    unset rvm_wrapper_name
   fi
-  unset rvm_default_flag
 
-  if [[ ! -z "$rvm_symlink_name" ]]   ; then $rvm_scripts_path/symlink "$rvm_symlink_name" ; unset rvm_symlink_name   ; fi
-  if [[ ! -z "$rvm_editor_flag" ]]    ; then $rvm_scripts_path/symlink "editor"            ; unset rvm_editor_flag    ; fi
-  if [[ ! -z "$rvm_passenger_flag" ]] ; then $rvm_scripts_path/symlink "passenger"         ; unset rvm_passenger_flag ; fi
-  if [[ ! -z "$rvm_rvmrc_flag" ]]     ; then __rvm_set_rvmrc ; fi
-  # Export ruby string and gem set name for extrnal scripts to take advantage of them.
-  if [[ ! -z "$rvm_ruby_string" ]]    ; then export rvm_ruby_string  ; fi
-  if [[ ! -z "$rvm_gemset_name" ]]   ; then export rvm_gemset_name ; fi
-  if [[ ! -z "$new_path" ]]           ; then export PATH="$new_path" ; unset new_path ; fi
+  if [[ ! -z "$rvm_rvmrc_flag" ]]   ; then __rvm_set_rvmrc ; fi
+  # Export ruby string and gem set me for extrnal scripts to take advantage of them.
+  if [[ ! -z "$rvm_ruby_string" ]]  ; then export rvm_ruby_string  ; fi
+  if [[ ! -z "$rvm_gemset_name" ]]  ; then export rvm_gemset_name ; fi
+  if [[ ! -z "$new_path" ]]         ; then export PATH="$new_path" ; unset new_path ; fi
 
   if [[ "maglev" = "$rvm_ruby_interpreter" ]] ; then
     export MAGLEV_HOME="$rvm_ruby_home"
@@ -369,27 +348,29 @@ __rvm_ruby_string() {
   # * rvm_ruby_tag
   # * rvm_ruby_patch
 
+  # Alias'd rubies
+  if [[ -z "$rvm_expanding_aliases" ]]; then
+    rvm_ruby_string="${rvm_ruby_string:-"default"}"
+    expanded_alias_name="$($rvm_scripts_path/alias show "$rvm_ruby_string" 2>/dev/null)"
+    if [[ -n "$expanded_alias_name" ]]; then
+      rvm_ruby_string="$expanded_alias_name"
+    elif [[ "$rvm_ruby_string" = default ]]; then
+      # Default is not a known value. Instead, we need to therefore set it to system.
+      rvm_ruby_string="system"
+    fi
+  fi
+
   set_name=$(echo "$rvm_ruby_string" | awk -F${rvm_gemset_separator} '{print $2}')
   if [[ ! -z "$set_name" ]] ; then rvm_gemset_name="$set_name" ; fi
   ruby_string=$(echo "$rvm_ruby_string" | awk -F${rvm_gemset_separator} '{print $1}')
 
   __rvm_unset_ruby_variables
 
-  # Alias'd rubies
-  if [[ -z "$alias_name" ]] ; then
-    value="$($rvm_scripts_path/db "$rvm_config_path/alias" "$ruby_string" 2>/dev/null)"
-    if [[ ! -z "$value" ]] ; then ruby_string="$value" ; fi
-  fi
-
   for string in $(echo $ruby_string | tr '-' ' ') ; do
     if [[ "head" = "$string" ]] ; then
       rvm_ruby_revision="head"
       unset rvm_ruby_patch_level rvm_ruby_revision rvm_ruby_tag
       export rvm_head_flag=1
-    elif [[ "default" = "$string" ]] ; then
-      rvm_ruby_interpreter="default"
-      unset rvm_ruby_patch_level rvm_ruby_tag rvm_head_flag rvm_ruby_revision rvm_ruby_version rvm_gemset_name
-      return
     elif [[ "system" = "$string" ]] ; then
       rvm_ruby_interpreter="system"
       unset rvm_ruby_patch_level rvm_ruby_tag rvm_head_flag rvm_ruby_revision rvm_ruby_version rvm_gemset_name

data/scripts/set

@@ -37,7 +37,7 @@ __rvm_ruby_do() {
 
   if [[ ! -z "$rvm_ruby_mode" ]] ; then
     rvm_ruby_string="${rvm_ruby_string}-${rvm_ruby_mode}"
-    rvm_ruby_mode="--$(echo $rvm_ruby_mode | sed 's/^m//')"
+    rvm_ruby_mode="--$(echo "$rvm_ruby_mode" | sed 's/^m//')"
   fi
 
   load_path="$(dirname $(command -v $binary) 2>/dev/null):$rvm_ruby_load_path"
@@ -63,7 +63,7 @@ __rvm_ruby_do() {
     eval "$rvm_command" >> ./log/$rvm_ruby_string/$action.log 2>> ./log/$rvm_ruby_string/$action.error.log
   else
     if [[ "$rvm_verbose_flag" != "0" ]] ; then
-      $rvm_scripts_path/log "info" "$rvm_ruby_string: $($rvm_ruby_home/bin/ruby -v $rvm_ruby_mode | tr "\n" ' ')"
+      $rvm_scripts_path/log "info" "$rvm_ruby_string: $($rvm_ruby_home/bin/ruby -v $rvm_ruby_mode | tr "\n" ' ')\n"
     fi
     eval "$rvm_command"
   fi
@@ -93,7 +93,7 @@ __rvm_summary() {
   fi
   total=${#rubies[*]}
   if [[ ! -z "$ZSH_VERSION" ]] ; then array_start=1 ; else array_start=0 ; fi
-  echo -e "$summary" | tee -a log/summary.log
+  printf "$summary" | tee -a log/summary.log
   return ${#errors[*]}
 }
 
@@ -114,7 +114,7 @@ __rvm_yaml() {
     yaml="$yaml\n  \"${rubies[$index]}\": ${statuses[$index]}"
   done ; unset index array_start
   mkdir -p log
-  echo -e "$yaml" | tee -a log/summary.yaml
+  printf "$yaml" | tee -a log/summary.yaml
 
   return ${#errors[*]}
 }
@@ -122,9 +122,9 @@ __rvm_yaml() {
 # Output the summary in a json format.
 __rvm_json() {
   json="{"
-  json="$json\n  \"totals\": { \"rubies\": ${#rubies[*]}, \"successes\": ${#successes[*]}, \"errors\": ${#errors[*]}},"
-  json="$json\n  \"successful\": [ "$(echo ${successes[*]} | sed 's# #", "#g')" ],"
-  json="$json\n  \"errors\": [ "$(echo ${errors[*]} | sed 's# #", "#g')" ],"
+  json="$json\n  \"totals\": { \"rubies\": ${#rubies[*]}, \"successes\": ${#successes[*]}, \"errors\": ${#errors[*]} },"
+  json="$json\n  \"successful\": [$(echo \"${successes[*]}\" | sed 's# #", "#g' | sed 's#\"\"##')],"
+  json="$json\n  \"errors\": [$(echo \"${errors[*]}\" | sed 's# #", "#g' | sed 's#\"\"##')],"
   json="$json\n  \"rubies\": {"
 
   total=${#rubies[*]}
@@ -139,7 +139,7 @@ __rvm_json() {
   json="$json\n  }\n}"
 
   mkdir -p log
-  echo -e "$json" | tee -a log/summary.json
+  printf "$json" | tee -a log/summary.json
 
   return ${#errors[*]}
 }

data/scripts/update

@@ -11,7 +11,7 @@ source scripts/version
 source scripts/utility
 
 usage() {
-  echo -e "
+  printf "
   Usage:
     ${0} [options]
 
@@ -27,7 +27,7 @@ spinner_counter=0
 spinner() {
   array=('/' '-' '\\' '|' '/' '-' '\\' '|')
   index=$((($spinner_counter % 8)))
-  echo -e -n "\r${array[$index]}"
+  printf "\r${array[$index]}"
   let "spinner_counter=spinner_counter+1"
   command -v perl > /dev/null 2>&1 && perl -e 'sleep 0.5'
 }
@@ -86,19 +86,17 @@ rvm_scripts_path="${rvm_scripts_path:-"$rvm_path/scripts"}"
 rvm_config_path="${rvm_config_path:-"$rvm_path/config"}"
 rvm_hooks_path="${rvm_hooks_path:-"$rvm_path/hooks"}"
 rvm_tmp_path="${rvm_tmp_path:-"$rvm_path/tmp"}"
-rvm_symlink_path="${rvm_symlink_path:-$rvm_prefix/bin}"
 
 export rvm_gemset_separator="@" # TODO: Remove this after a while.
 
-echo -e "\n$(tput setaf 2)RVM$(tput sgr0) - shell scripts which allow management of multiple ruby interpreters and environments."
-echo -e "\n    $(tput setaf 2)RTFM: $(tput sgr0) http://rvm.beginrescueend.com/"
-echo -e "\n    $(tput setaf 2)HELP: $(tput sgr0) http://webchat.freenode.net/?channels=rvm (#rvm on irc.freenode.net)"
+printf "\n$(tput setaf 2)RVM:$(tput sgr0)   shell scripts which allow management of multiple ruby interpreters and environments."
+printf "\n$(tput setaf 2)RTFM: $(tput sgr0) http://rvm.beginrescueend.com/"
+printf "\n$(tput setaf 2)HELP: $(tput sgr0) http://webchat.freenode.net/?channels=rvm (#rvm on irc.freenode.net)"
 
-echo -e "\n********************************************************************************"
 if [[ "$upgrade_flag" -eq 1 ]] ;then
-  echo -e -n "  Upgrading the RVM installation in $rvm_path/"
+  printf "\n\n  Upgrading the RVM installation in $rvm_path/"
 else
-  echo -e -n "  Installing rvm to $rvm_path/"
+  printf "\n\n  Installing rvm to $rvm_path/"
 fi
 
 spinner
@@ -150,19 +148,19 @@ chmod +x $rvm_bin_path/*
 #
 spinner
 if [[ ! -z "$rvm_auto_flag" ]] ; then
-  echo -e "Checking rc files... ($rvm_rc_files)"
+  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 [[ -s "$HOME/.profile" ]] ; then
         if ! grep -q '.profile' "$rcfile" ; then
           echo "    Adding 'if [[ -s \$HOME/.profile ]] ; then source \$HOME ; fi' to $rcfile."
-          echo -e "\n# rvm-install added line:\nif [[ -s \$HOME/.profile ]] ; then source \$HOME/.profile ; fi\n" >> $rcfile
+          printf "\n# rvm-install added line:\nif [[ -s \$HOME/.profile ]] ; then source \$HOME/.profile ; fi\n" >> $rcfile
         fi
       fi
       if ! grep -q "scripts\/rvm" "$rcfile" ; then
         echo "    Adding 'if [[ -s $rvm_scripts_path/rvm ]] ; then source $rvm_scripts_path/rvm ; fi' to $rcfile."
-        echo -e "\n# rvm-install added:\nif [[ -s $rvm_scripts_path/rvm ]] ; then source $rvm_scripts_path/rvm ; fi\n" >> $rcfile
+        printf "\n# rvm-install added:\nif [[ -s $rvm_scripts_path/rvm ]] ; then source $rvm_scripts_path/rvm ; fi\n" >> $rcfile
       fi
     done
   fi
@@ -196,12 +194,12 @@ done
 # Migrate old gemset directories to new gemset pattern.
 #
 spinner
-echo -e -n "\r*" # Stop spinner.
+printf "\r*" # Stop spinner.
 
 for gemset in $rvm_path/gems/*\%* ; do
   new_path=${gemset/\%/${rvm_gemset_separator}}
   if [[ -d "$gemset" ]] && [[ ! -d "$new_path" ]] ; then
-    echo -e "    Renaming $(basename $gemset) to $(basename $new_path) for new gemset separator."
+    printf "\n    Renaming $(basename $gemset) to $(basename $new_path) for new gemset separator."
     mv $gemset $new_path
   fi
 done
@@ -209,22 +207,26 @@ done
 for gemset in $rvm_path/gems/*\+* ; do
   new_path=${gemset/\+/${rvm_gemset_separator}}
   if [[ -d "$gemset" ]] && [[ ! -d "$new_path" ]] ; then
-    echo -e "    Renaming $(basename $gemset) to $(basename $new_path) for new gemset separator."
+    printf "\n    Renaming $(basename $gemset) to $(basename $new_path) for new gemset separator."
     mv $gemset $new_path
   fi
 done
 for gemset in $rvm_path/gems/*\@ ; do
   new_path=$(echo $gemset | sed -e 's#\@$##')
   if [[ -d "$gemset" ]] && [[ ! -d "$new_path" ]] ; then
-    echo -e "    Fixing: $(basename $gemset) to $(basename $new_path) for new gemset separator."
+    printf "\n    Fixing: $(basename $gemset) to $(basename $new_path) for new gemset separator."
     mv $gemset $new_path
   fi
 done
 
-# Upgrade any default file.
-if [[ -s $rvm_config_path/default ]] && grep -q '\%' $rvm_config_path/default ; then
-  sed -e "s#\%#${rvm_gemset_separator}#g" $rvm_config_path/default > $rvm_config_path/default.new
-  mv $rvm_config_path/default.new $rvm_config_path/default
+# Move from legacy defaults to the new, alias based system.
+if [[ -s "$rvm_config_path/default" ]]; then
+  original_version="$(basename "$(grep GEM_HOME "$rvm_config_path/default" | awk -F"'" '{print $2}' | sed "s#\%#${rvm_gemset_separator}#")")"
+  if [[ -n "$original_version" ]]; then
+    $rvm_scripts_path/alias create default "$original_version" &> /dev/null
+  fi
+  unset original_version
+  rm -rf "$rvm_config_path/default"
 fi
 
 #
@@ -232,64 +234,60 @@ fi
 #
 
 if [[ "root" = "$(whoami)" ]] ; then
-  echo -e "\n    Symlinking rvm to $rvm_symlink_path/rvm ..."
-  mkdir -p $rvm_symlink_path
-  ln -nfs $rvm_bin_path/rvm $rvm_symlink_path/rvm
-  ln -nfs $rvm_bin_path/rvmsudo $rvm_symlink_path/rvmsudo
-  chmod +x $rvm_symlink_path/rvm
-  chmod +x $rvm_symlink_path/rvmsudo
+  printf "\n    Symlinking rvm to $rvm_bin_path/rvm ..."
+  mkdir -p $rvm_bin_path
+  chmod +x $rvm_bin_path/rvm
+  chmod +x $rvm_bin_path/rvmsudo
 fi
 
 if [[ "$upgrade_flag" -eq 0 ]] ; then
-  echo -e "\n********************************************************************************"
   ./scripts/notes
 fi
 
-echo -e "\n********************************************************************************"
 name="$(awk -F= '/^[[:space:]]*name/{print $2}' ~/.gitconfig 2>/dev/null)"
-echo -e "\n${name:-"$(whoami)"},\n"
-echo -e "\nThank you for using rvm. I hope that it makes your work easier and more enjoyable."
-echo -e "If you have any questions, issues and/or ideas for improvement please hop in #rvm on irc.freenode.net and let me know."
-echo -e "My irc nickname is 'wayneeseguin' and I hang out from ~09:00-17:00EST and again from ~21:00EST-~00:00EST."
-echo -e "If I do not respond right away, please hang around after asking your question, I will respond as soon as I am back."
-echo -e "Be sure to get head often as rvm development happens fast, you can do this by typing 'rvm update --head'."
-echo -e "\n  w$(tput setaf 2)⦿‿⦿$(tput sgr0)t!"
-echo -e "\n    ~ Wayne"
-echo -e "\n********************************************************************************"
+printf "\n\n${name:-"$(whoami)"},\n"
+printf "\nThank you for using rvm. I hope that it makes your work easier and more enjoyable."
+printf "\nIf you have any questions, issues and/or ideas for improvement please hop in #rvm on irc.freenode.net and let me know."
+printf "\nMy irc nickname is 'wayneeseguin' and I hang out from ~09:00-17:00EST and again from ~21:00EST-~00:00EST."
+printf "\nIf I do not respond right away, please hang around after asking your question, I will respond as soon as I am back."
+printf "\nBe sure to get head often as rvm development happens fast, you can do this by typing 'rvm update --head'."
+printf "\n  w$(tput setaf 2)⦿‿⦿$(tput sgr0)t!"
+printf "\n    ~ Wayne\n"
 
 if [[ "$upgrade_flag" -eq 1 ]] ; then
-  echo -e "\n$(tput setaf 6)**** NOTICE *************************************************************************************"
-  echo -e "*  Gemset separator has changed, it is now @ and will remain unless any rubies error using it.  *"
-  echo -e "*  If you encounter any issues with a ruby your best bet is to 'rvm remove X ; rvm install X'   *"
-  echo -e "*************************************************************************************************$(tput sgr0)\n"
-  echo -e "Upgrade of RVM in $rvm_path/ is complete.\n"
+  printf "\n$(tput setaf 6)Upgrade Notes\n"
+  printf "\n  * Gemset separator is '@' and will remain unless any rubies error using it."
+  printf "\n  * If you encounter any issues with a ruby your best bet is to 'rvm remove X ; rvm install X' "
+  printf "\n  * Do not forget that 'rvm notes' tells you OS dependency packages for installing rubies."
+  printf "\n$(tput sgr0)\n"
+  printf "\nUpgrade of RVM in $rvm_path/ is complete.\n\n"
 else
   if [[ "root" != "$(whoami)" ]] ; then
-    echo -e "\n$(tput setaf 1)You must now finish the install manually:$(tput sgr0)"
-    echo -e "\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:"
-    echo -e "\n     if [[ -s $rvm_path/scripts/rvm ]] ; then source $rvm_path/scripts/rvm ; fi"
-    echo -e "\n2) Ensure that there is no 'return' from inside the .bashrc file. (otherwise rvm will be prevented from working properly)."
-    echo -e "\n   This means that if you see '[ -z "$PS1" ] && return' then you must change this line to:"
-    echo -e "\n   if [[ ! -z "$PS1" ]] ; then"
-    echo -e "\n     ... original content that was below the && return line ..."
-    echo -e "\n   fi # <= be sure to close the if."
-    echo -e "\n   #EOF .bashrc"
-    echo -e "\n   Be absolutely *sure* to REMOVE the '&& return'."
-    echo -e "\n   If you wish to DRY up your config you can 'source ~/.bashrc' at the top of your .bash_profile."
-    echo -e "\n   placing all non-interactive items in the .bashrc"
-    echo -e "\n3) Then $(tput setaf 1)CLOSE THIS SHELL$(tput sgr0) and open a new one in order to use rvm.\n"
+    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     if [[ -s $rvm_path/scripts/rvm ]] ; then source $rvm_path/scripts/rvm ; fi"
+    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 [[ ! -z "$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"
+    printf "\n   Be absolutely *sure* to REMOVE the '&& return'."
+    printf "\n   If you wish to DRY up your config you can 'source ~/.bashrc' at the top of your .bash_profile."
+    printf "\n   placing all non-interactive items in the .bashrc"
+    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 '&& return' $HOME/.bashrc ; then
-    echo -e "\n\nWARNING:  you have a 'return' statement in your .bashrc, likely this will cause untold havoc.
-       This means that if you see '[ -z "\$PS1" ] && return' then you must change this line to:
-       if [[ -n "\$PS1" ]] ; then
-         ... original content that was below the && return line ...
-       fi # <= be sure to close the if.
-       #EOF .bashrc
-
-    If you have any questions about this please visit #rvm on irc.freenode.net.\n"
+    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     ... original content that was below the && return line ..."
+    printf "\n   fi # <= be sure to close the if."
+    printf "\n   #EOF .bashrc"
+    printf "\nEven if you use zsh you should still adjust the .bashrc as above."
+    printf "\nIf you have any questions about this please visit #rvm on irc.freenode.net.\n"
   fi
-  echo -e "Installation of RVM to $rvm_path/ is complete.\n\n"
+  printf "\nInstallation of RVM to $rvm_path/ is complete.\n\n"
 fi
 
 exit 0