rvm 0.1.24 → 0.1.26

data/scripts/notes

@@ -3,14 +3,6 @@
 system="$(uname)"
 item="$(tput setaf 2)* $(tput sgr0)"
 
-echo -e "\n$(tput setaf 6)**** NOTICE *************************************************************************************"
-echo -e "*  The rubies install path has moved to \$rvm_path/rubies/ instead of directly in \$rvm_path.     *"
-echo -e "*  If you encounter any issues with a ruby your best bet is to 'rvm remove X ; rvm install X'   *"
-echo -e "*  Gems are now per interpreter installation instead of per interpreter/version                 *"
-echo -e "*  so for example to upgrade an older install of 1.8.6 and preserve gems:                       *"
-echo -e "*  rm -rf ~/.rvm/gems/ruby-1.8.6-p383 ;  mv ~/.rvm/gems/ruby/1.8.6 ~/.rvm/gems/ruby-1.8.6-p383  *"
-echo -e "*************************************************************************************************$(tput sgr0)\n"
-
 if [[ "Linux" = "$system" ]] ; then
   for file in /etc/*-release ; do
     release="( $(cat $file) )" ; break

data/scripts/package

@@ -92,7 +92,8 @@ zlib() {
 }
 
 ncurses() {
-  package_url="ftp://invisible-island.net/ncurses/ncurses"
+
+  package_url="http://ftp.gnu.org/pub/gnu/ncurses"
   package="ncurses" ; version="5.7" ; archive_format="tar.gz"
   configure_flags="--with-shared --disable-rpath --without-debug --without-ada --enable-safe-sprintf --enable-sigwinch --without-progs"
   install_package

data/scripts/rvm-install

@@ -13,9 +13,9 @@ source scripts/utility
 usage() {
   echo -e "
   Usage:
-    ${0} <options>
+    ${0} [options]
 
-  Options:
+  options:
     --auto    : Automatically update shell profile files.
     --prefix  : Installation prefix directory.
     --help    : Display help/usage (this) message
@@ -23,6 +23,15 @@ usage() {
   "
 }
 
+spinner_counter=0
+spinner() {
+  array=('/' '-' '\\' '|' '/' '-' '\\' '|')
+  index=$((($spinner_counter % 8)))
+  echo -e -n "\r${array[$index]}"
+  let "spinner_counter=spinner_counter+1"
+  which perl > /dev/null 2>&1 && perl -e 'sleep 0.5'
+}
+
 if echo "$*" | grep -q 'trace' ; then echo "$*" ; env | grep '^rvm_' ; set -x ; fi
 
 while [[ $# -gt 0 ]] ; do
@@ -47,18 +56,25 @@ fi
 if [[ -z "$rvm_path" ]] ; then rvm_path="${rvm_prefix}rvm" ; fi
 
 source scripts/initialize
+if grep -q 'scripts/rvm' $HOME/.bash* || grep -q 'scripts/rvm' $HOME/.zsh*; then
+  if [[ -d "$rvm_path" ]] && [[ -s "${rvm_path}/scripts/rvm" ]] ; then
+    export upgrade_flag=1
+  else
+    export upgrade_flag=0
+  fi
+else
+  export upgrade_flag=0
+fi
+
 __rvm_initialize
 
 #
-# Setup
+# Setup & Configuration
 #
 item="$(tput setaf 2)* $(tput sgr0)"
 question="\n$(tput setaf 2)<?>$(tput sgr0)"
 cwd=$(pwd)
 source_path="${source_path:-$cwd}"
-
-# State what is required to use rvm
-echo -e "\nInstalling rvm to $rvm_path/ ..."
 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"}"
@@ -71,9 +87,25 @@ 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)"
+
+echo -e "\n********************************************************************************"
+if [[ "$upgrade_flag" -eq 1 ]] ;then
+  echo -e -n "  Upgrading the RVM installation in $rvm_path/"
+else
+  echo -e -n "  Installing rvm to $rvm_path/"
+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 $rvm_symlink_path $HOME/.gem/cache
 
 for file in README LICENCE ; do
+  spinner
   cp -f "$source_path/$file" "$rvm_path/"
 done
 
@@ -81,19 +113,22 @@ done
 # Scripts
 #
 for dir_name in config scripts examples lib hooks ; do
+  spinner
   mkdir -p "$rvm_path/$dir_name"
   if [[ -d "$source_path/$dir_name" ]] ; then
     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/"
   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 $(echo $scripts) ; do
+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
 done
 
@@ -102,14 +137,17 @@ done
 #
 # Cleanse and purge...
 for file in rvm-prompt rvm rvmsudo ; do
+  spinner && perl -e 'sleep 0.2'
   rm -f "$rvm_bin_path/$file"
   cp -f "$source_path/binscripts/$file" $rvm_bin_path/
 done
+spinner
 chmod +x $rvm_bin_path/*
 
 #
 # RC Files
 #
+spinner
 if [[ ! -z "$rvm_auto_flag" ]] ; then
   echo -e "Checking rc files... ($rvm_rc_files)"
   if [[ "$rvm_loaded_flag" != "1" ]] ; then
@@ -134,11 +172,13 @@ fi
 #
 rvm_rubies_path="${rvm_rubies_path:-"$rvm_path/rubies"}"
 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
     mv "$ruby" "$rvm_rubies_path/"
     new_path="$rvm_rubies_path/$(basename $ruby)"
     for file in gem rake ; do
+      spinner
       if [[ -s "$new_path/bin/$file" ]] ; then
         sed -i.orig -e '1,1s=.*=#!'"$new_path/bin/ruby=" "$new_path/bin/$file"
         rm -f "$new_path/bin/$file.orig"
@@ -148,7 +188,46 @@ for ruby in $rvm_path/ruby-* $rvm_path/jruby-* $rvm_path/mput-* $rvm_path/rbx-*
   fi
 done
 #
-# End of migration.
+# End of rubies migration.
+#
+
+#
+# Migrate old gemset directories to new gemset pattern.
+#
+spinner
+echo -e -n "\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."
+    mv $gemset $new_path
+  fi
+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."
+    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."
+    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
+fi
+
+#
+# End of gemset migration.
 #
 
 if [[ "root" = "$(whoami)" ]] ; then
@@ -160,11 +239,11 @@ if [[ "root" = "$(whoami)" ]] ; then
   chmod +x $rvm_symlink_path/rvmsudo
 fi
 
-echo -e "\n$(tput setaf 2)rvm$(tput sgr0) - shell scripts that allows a user to manage multiple ruby versions in their own account."
-./scripts/notes
+if [[ "$upgrade_flag" -eq 0 ]] ; then
+  echo -e "\n********************************************************************************"
+  ./scripts/notes
+fi
 
-echo -e "$(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 "
 echo -e "\n********************************************************************************"
 name="$(awk -F= '/^[[:space:]]*name/{print $2}' ~/.gitconfig 2>/dev/null)"
 echo -e "\n${name:-"$(whoami)"},\n"
@@ -177,20 +256,28 @@ echo -e "\n  w$(tput setaf 2)⦿‿⦿$(tput sgr0)t!"
 echo -e "\n    ~ Wayne"
 echo -e "\n********************************************************************************"
 
-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 and then .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 remove it and split your .bashrc"
-  echo -e "\n   Put everything *except the return code line(s)* into your .bash_profile, and everything above that code in your .bashrc."
-  echo -e "\n   Be *sure* to REMOVE the '&& return' statement line."
-  echo -e "\n   If you wish to DRY up your config you can 'source ~/.bashrc' at the top of your .bash_profile."
-  echo -e "\n4) 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. Please remove it and refactor your profiles to be correct. If you have questions about this please visit #rvm on irc.freenode.net.\n\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"
+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 and then .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 remove it and split your .bashrc"
+    echo -e "\n   Put everything *except the return code line(s)* into your .bash_profile, and everything above that code in your .bashrc."
+    echo -e "\n   Be *sure* to REMOVE the '&& return' statement line."
+    echo -e "\n   If you wish to DRY up your config you can 'source ~/.bashrc' at the top of your .bash_profile."
+    echo -e "\n4) 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. Please remove it and refactor your profiles to be correct. If you have questions about this please visit #rvm on irc.freenode.net.\n"
+  fi
+  echo -e "Installation of RVM to $rvm_path/ is complete.\n\n"
 fi
 
 exit 0

data/scripts/selector

@@ -46,7 +46,7 @@ __rvm_select() {
       rvm_ruby_interpreter="rbx"
       rvm_ruby_version=${rvm_ruby_version:-$(__rvm_db "rbx_version")}
       rvm_ruby_repo_url=${rvm_rbx_repo_url:-$(__rvm_db "rubinius_repo_url")}
-      __rvm_db "rbx_url" "rvm_url"
+      __rvm_db "rbx_${rvm_ruby_version}_${rvm_ruby_patch_level}_url" "rvm_url"
       if [[ -z "$rvm_head_flag" ]] ; then
         rvm_ruby_patch_level=${rvm_ruby_patch_level:-$(__rvm_db "rbx_patch_level")}
         rvm_ruby_string="$rvm_ruby_interpreter-$rvm_ruby_version-p$rvm_ruby_patch_level"
@@ -210,7 +210,7 @@ __rvm_select() {
     fi
 
     if [[ ! -z "$rvm_gemset_name" ]] ; then
-      rvm_ruby_gem_home="${rvm_ruby_gem_home}%${rvm_gemset_name}"
+      rvm_ruby_gem_home="${rvm_ruby_gem_home}${rvm_gemset_separator}${rvm_gemset_name}"
     fi
 
     rvm_ruby_selected_flag=1
@@ -295,7 +295,7 @@ __rvm_use() {
     fi
 
     if [[ ! -z "$rvm_verbose_flag" ]] ; then
-      $rvm_scripts_path/log "info" "Using $(basename $GEM_HOME | tr '-' ' ' | sed 's/%/ with gemset /')"
+      $rvm_scripts_path/log "info" "Using $(basename $GEM_HOME | tr '-' ' ' | sed 's/'${rvm_gemset_separator}'/ with gemset /')"
     fi
 
     new_path="$(echo $PATH | tr ':' '\n' | awk '$0 !~ /rvm/' | paste -sd : -)"
@@ -367,9 +367,9 @@ __rvm_ruby_string() {
   # * rvm_ruby_tag
   # * rvm_ruby_patch
 
-  set_name=$(echo "$rvm_ruby_string" | awk -F'%' '{print $2}')
+  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'%' '{print $1}')
+  ruby_string=$(echo "$rvm_ruby_string" | awk -F${rvm_gemset_separator} '{print $1}')
 
   __rvm_unset_ruby_variables
 

data/scripts/update

@@ -13,9 +13,9 @@ source scripts/utility
 usage() {
   echo -e "
   Usage:
-    ${0} <options>
+    ${0} [options]
 
-  Options:
+  options:
     --auto    : Automatically update shell profile files.
     --prefix  : Installation prefix directory.
     --help    : Display help/usage (this) message
@@ -23,6 +23,15 @@ usage() {
   "
 }
 
+spinner_counter=0
+spinner() {
+  array=('/' '-' '\\' '|' '/' '-' '\\' '|')
+  index=$((($spinner_counter % 8)))
+  echo -e -n "\r${array[$index]}"
+  let "spinner_counter=spinner_counter+1"
+  which perl > /dev/null 2>&1 && perl -e 'sleep 0.5'
+}
+
 if echo "$*" | grep -q 'trace' ; then echo "$*" ; env | grep '^rvm_' ; set -x ; fi
 
 while [[ $# -gt 0 ]] ; do
@@ -47,18 +56,25 @@ fi
 if [[ -z "$rvm_path" ]] ; then rvm_path="${rvm_prefix}rvm" ; fi
 
 source scripts/initialize
+if grep -q 'scripts/rvm' $HOME/.bash* || grep -q 'scripts/rvm' $HOME/.zsh*; then
+  if [[ -d "$rvm_path" ]] && [[ -s "${rvm_path}/scripts/rvm" ]] ; then
+    export upgrade_flag=1
+  else
+    export upgrade_flag=0
+  fi
+else
+  export upgrade_flag=0
+fi
+
 __rvm_initialize
 
 #
-# Setup
+# Setup & Configuration
 #
 item="$(tput setaf 2)* $(tput sgr0)"
 question="\n$(tput setaf 2)<?>$(tput sgr0)"
 cwd=$(pwd)
 source_path="${source_path:-$cwd}"
-
-# State what is required to use rvm
-echo -e "\nInstalling rvm to $rvm_path/ ..."
 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"}"
@@ -71,9 +87,25 @@ 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)"
+
+echo -e "\n********************************************************************************"
+if [[ "$upgrade_flag" -eq 1 ]] ;then
+  echo -e -n "  Upgrading the RVM installation in $rvm_path/"
+else
+  echo -e -n "  Installing rvm to $rvm_path/"
+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 $rvm_symlink_path $HOME/.gem/cache
 
 for file in README LICENCE ; do
+  spinner
   cp -f "$source_path/$file" "$rvm_path/"
 done
 
@@ -81,19 +113,22 @@ done
 # Scripts
 #
 for dir_name in config scripts examples lib hooks ; do
+  spinner
   mkdir -p "$rvm_path/$dir_name"
   if [[ -d "$source_path/$dir_name" ]] ; then
     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/"
   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 $(echo $scripts) ; do
+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
 done
 
@@ -102,14 +137,17 @@ done
 #
 # Cleanse and purge...
 for file in rvm-prompt rvm rvmsudo ; do
+  spinner && perl -e 'sleep 0.2'
   rm -f "$rvm_bin_path/$file"
   cp -f "$source_path/binscripts/$file" $rvm_bin_path/
 done
+spinner
 chmod +x $rvm_bin_path/*
 
 #
 # RC Files
 #
+spinner
 if [[ ! -z "$rvm_auto_flag" ]] ; then
   echo -e "Checking rc files... ($rvm_rc_files)"
   if [[ "$rvm_loaded_flag" != "1" ]] ; then
@@ -134,11 +172,13 @@ fi
 #
 rvm_rubies_path="${rvm_rubies_path:-"$rvm_path/rubies"}"
 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
     mv "$ruby" "$rvm_rubies_path/"
     new_path="$rvm_rubies_path/$(basename $ruby)"
     for file in gem rake ; do
+      spinner
       if [[ -s "$new_path/bin/$file" ]] ; then
         sed -i.orig -e '1,1s=.*=#!'"$new_path/bin/ruby=" "$new_path/bin/$file"
         rm -f "$new_path/bin/$file.orig"
@@ -148,7 +188,46 @@ for ruby in $rvm_path/ruby-* $rvm_path/jruby-* $rvm_path/mput-* $rvm_path/rbx-*
   fi
 done
 #
-# End of migration.
+# End of rubies migration.
+#
+
+#
+# Migrate old gemset directories to new gemset pattern.
+#
+spinner
+echo -e -n "\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."
+    mv $gemset $new_path
+  fi
+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."
+    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."
+    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
+fi
+
+#
+# End of gemset migration.
 #
 
 if [[ "root" = "$(whoami)" ]] ; then
@@ -160,11 +239,11 @@ if [[ "root" = "$(whoami)" ]] ; then
   chmod +x $rvm_symlink_path/rvmsudo
 fi
 
-echo -e "\n$(tput setaf 2)rvm$(tput sgr0) - shell scripts that allows a user to manage multiple ruby versions in their own account."
-./scripts/notes
+if [[ "$upgrade_flag" -eq 0 ]] ; then
+  echo -e "\n********************************************************************************"
+  ./scripts/notes
+fi
 
-echo -e "$(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 "
 echo -e "\n********************************************************************************"
 name="$(awk -F= '/^[[:space:]]*name/{print $2}' ~/.gitconfig 2>/dev/null)"
 echo -e "\n${name:-"$(whoami)"},\n"
@@ -177,20 +256,28 @@ echo -e "\n  w$(tput setaf 2)⦿‿⦿$(tput sgr0)t!"
 echo -e "\n    ~ Wayne"
 echo -e "\n********************************************************************************"
 
-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 and then .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 remove it and split your .bashrc"
-  echo -e "\n   Put everything *except the return code line(s)* into your .bash_profile, and everything above that code in your .bashrc."
-  echo -e "\n   Be *sure* to REMOVE the '&& return' statement line."
-  echo -e "\n   If you wish to DRY up your config you can 'source ~/.bashrc' at the top of your .bash_profile."
-  echo -e "\n4) 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. Please remove it and refactor your profiles to be correct. If you have questions about this please visit #rvm on irc.freenode.net.\n\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"
+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 and then .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 remove it and split your .bashrc"
+    echo -e "\n   Put everything *except the return code line(s)* into your .bash_profile, and everything above that code in your .bashrc."
+    echo -e "\n   Be *sure* to REMOVE the '&& return' statement line."
+    echo -e "\n   If you wish to DRY up your config you can 'source ~/.bashrc' at the top of your .bash_profile."
+    echo -e "\n4) 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. Please remove it and refactor your profiles to be correct. If you have questions about this please visit #rvm on irc.freenode.net.\n"
+  fi
+  echo -e "Installation of RVM to $rvm_path/ is complete.\n\n"
 fi
 
 exit 0