rvm 0.0.9999 → 0.1.0

data/README

@@ -35,6 +35,8 @@ Implementation
   jruby     - JRuby
   rbx       - rubinius
   ree       - ruby Enterprise Edition
+  macruby   - MacRuby (Mac OS X Only)
+  maglev    - Gemstone Ruby
   ironruby  - IronRuby
   mput      - shyouhei(mput)'s github repository
   system    - use the system ruby (eg. pre-rvm state)
@@ -42,7 +44,7 @@ Implementation
 
 Flags
 
-  --self        - with update, updates rvm itself
+  --head        - with update, updates rvm to git head version.
   --rubygems    - with update, updates rubygems for selected ruby
   --default     - with ruby select, sets a default ruby for new shells.
   --debug       - Toggle debug mode on for very verbose output.

data/config/db

@@ -25,7 +25,7 @@ jruby_url=http://jruby.kenai.com/downloads/
 macruby_version=nightly
 macruby_repo_url=git://git.macruby.org/macruby/MacRuby.git
 macruby_nightly_url=http://macruby.icoretech.org/latest/macruby_nightly-latest.pkg
-maglev_version=22710
+maglev_version=22725
 maglev_url=http://glass-downloads.gemstone.com/maglev
 maglev_repo_url=git://github.com/MagLev/maglev.git
 rubinius_repo_url=git://github.com/evanphx/rubinius.git

data/install

@@ -64,7 +64,7 @@ cp -f "$source_path/README" "$rvm_path/"
 #
 # Scripts
 #
-rm -rf $rvm_path/scripts # Clear the old scripts directory so that the old style rvm- scripts are cleared out.
+rm -rf $rvm_scripts_path # Clear the old scripts directory so that the old style rvm- scripts are cleared out.
 for dir_name in config scripts examples lib hooks ; do
   mkdir -p "$rvm_path/$dir_name"
   if [[ -d "$source_path/$dir_name" ]] ; then
@@ -72,19 +72,19 @@ for dir_name in config scripts examples lib hooks ; do
   fi
 done ; unset dir_name
 
-if [[ ! -s "$rvm_path/config/user" ]] ; then
-  echo '# Users settings file, overrides db file settings and persists across installs.' >> $rvm_path/config/user
+if [[ ! -s "$rvm_config_path/user" ]] ; then
+  echo '# Users settings file, overrides db file settings and persists across installs.' >> $rvm_config_path/user
 fi
 
 #
 # Bin Scripts
 #
 # Cleanse and purge...
-rm -f $rvm_path/bin/rvm ; rm -rf $rvm_path/bin/binscripts
+rm -f $rvm_bin_path/rvm ; rm -rf $rvm_bin_path/binscripts
 for file in rvm-prompt rvm rvmsudo ; do
-  cp -f "$source_path/binscripts/$file" $rvm_path/bin/
+  cp -f "$source_path/binscripts/$file" $rvm_bin_path/
 done
-chmod +x $rvm_path/bin/*
+chmod +x $rvm_bin_path/*
 
 #
 # RC Files
@@ -101,37 +101,50 @@ if [[ ! -z "$rvm_auto_flag" ]] ; then
         fi
       fi
       if ! grep -q "scripts\/rvm" "$rcfile" ; then
-        echo "    Adding 'if [[ -s $rvm_path/scripts/rvm ]] ; then source $rvm_path/scripts/rvm ; fi' to $rcfile."
-        echo -e "\n# rvm-install added:\nif [[ -s $rvm_path/scripts/rvm ]] ; then source $rvm_path/scripts/rvm ; fi\n" >> $rcfile
+        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
       fi
     done
   fi
 fi
 
 #
-# TODO: Migrate ~/.rvm/ruby-X,jruby-X,... to ~/.rvm/rubies/
+# 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/"
+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
+      if [[ -s "$new_path/bin/$file" ]] ; then
+        sed -i -e '1,1s=.*=#!'"$new_path/bin/ruby=" "$new_path/bin/$file"
+        rm -f "$new_path/bin/$file.orig"
+        chmod +x "$new_path/bin/$file"
+      fi
+    done
+  fi
+done
+#
+# End of migration.
 #
-#rvm_rubies_path="${rvm_rubies_path:-"$rvm_path/rubies"}"
-#mkdir -p $rvm_rubies_path
-#for ruby in "$rvm_path"/ruby-* "$rvm_path"/jruby-* "$rvm_path"/mput-* "$rvm_path"/rbx-* ; do
-#  if [[ -d "$ruby" ]] ; then mv "$ruby" "$rvm_rubies_path" ; fi
-#done
 
 if [[ "root" = "$(whoami)" ]] ; then
   echo -e "\n    Symlinking rvm to $rvm_symlink_path/rvm ..."
   mkdir -p $rvm_symlink_path
-  ln -nfs $rvm_path/bin/rvm $rvm_symlink_path/rvm
-  ln -nfs $rvm_path/bin/rvmsudo $rvm_symlink_path/rvmsudo
+  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
 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."
-$rvm_path/scripts/notes
+$rvm_scripts_path/notes
 
 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 "================================================================================"
+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."
@@ -139,13 +152,8 @@ echo -e "If you have any questions, issues and/or ideas for improvement please h
 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 "\n  w$(tput setaf 2)⦿‿⦿$(tput sgr0)t!"
-echo -e "\n    ~ Wayne\n"
-echo "================================================================================"
-echo -e "Upgrades"
-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 "================================================================================"
+echo -e "\n    ~ Wayne"
+echo -e "\n********************************************************************************"
 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"

data/lib/VERSION.yml

@@ -1,4 +1,4 @@
 ---
 :major: 0
-:minor: 0
-:patch: 9999
+:minor: 1
+:patch: 0

data/rvm.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rvm}
-  s.version = "0.0.9999"
+  s.version = "0.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Wayne E. Seguin"]

data/scripts/cli

@@ -353,7 +353,7 @@ rvm() {
   if [[ ! -z "$PS1" ]] ; then export rvm_interactive=1 ; else unset rvm_interactive ; fi
 
   if [[ -z "$ZSH_VERSION" ]] ; then
-    trap 'rm -rf "$rvm_path/tmp/$$" >/dev/null 2>&1' 0 1 2 3 15
+    trap 'rm -rf "$rvm_tmp_path/$$" >/dev/null 2>&1' 0 1 2 3 15
   fi
 
   # Check that this is the current version.
@@ -438,7 +438,7 @@ rvm() {
       result=1
   esac
 
-  if [[ ! -z "$rvm_reload_flag" ]] ; then source "$rvm_path/scripts/rvm" ; fi
+  if [[ ! -z "$rvm_reload_flag" ]] ; then source "$rvm_scripts_path/rvm" ; fi
 
   if [[ ! -z "$rvm_trace_flag" ]] ; then set +x ; unset rvm_trace_flag ; fi
 

data/scripts/fetch

@@ -2,7 +2,7 @@
 
 if [[ ! -z "$rvm_trace_flag" ]] ; then set -x ; export rvm_trace_flag ; fi
 
-trap "if [[ -d $rvm_path/tmp/ ]] && [[ -f $rvm_path/tmp/$$ ]] ; then rm -f $rvm_path/tmp/$$ > /dev/null 2>&1 ; fi ; exit" 0 1 2 3 15
+trap "if [[ -d $rvm_tmp_path/ ]] && [[ -f $rvm_tmp_path/$$ ]] ; then rm -f $rvm_tmp_path/$$ > /dev/null 2>&1 ; fi ; exit" 0 1 2 3 15
 
 if ! which curl &> /dev/null; then
   $rvm_scripts_path/log "fail" "rvm requires curl, which does not seem to exist in your path :("

data/scripts/gems

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
-source $rvm_path/scripts/utility
-source $rvm_path/scripts/selector
+source $rvm_scripts_path/utility
+source $rvm_scripts_path/selector
 
 color_green=$($rvm_scripts_path/color "green")
 color_red=$($rvm_scripts_path/color "red")
@@ -12,7 +12,7 @@ if [[ ! -z "$rvm_trace_flag" ]] ; then set -x ; export rvm_trace_flag ; fi
 rvm_ruby_gem_home="${rvm_ruby_gem_home:-$GEM_HOME}"
 if [[ -d "$rvm_ruby_gem_home" ]] && which gem &> /dev/null ; then rvm_ruby_gem_home="$(gem env home)" ; fi
 
-trap "if [[ -d $rvm_path/tmp/ ]] && [[ -f $rvm_path/tmp/$$ ]] ; then rm -f $rvm_path/tmp/$$ > /dev/null 2>&1 ; fi ; exit" 0 1 2 3 15
+trap "if [[ -d $rvm_tmp_path/ ]] && [[ -f $rvm_tmp_path/$$ ]] ; then rm -f $rvm_tmp_path/$$ > /dev/null 2>&1 ; fi ; exit" 0 1 2 3 15
 
 __rvm_gems_name() {
   echo "$(gem env gemdir)" | awk -F'%' '{print $2}'

data/scripts/hook

@@ -2,7 +2,7 @@
 
 if [[ ! -z "$rvm_trace_flag" ]] ; then set -x ; export rvm_trace_flag ; fi
 
-trap "if [[ -d $rvm_path/tmp/ ]] && [[ -f $rvm_path/tmp/$$ ]] ; then rm -f $rvm_path/tmp/$$ > /dev/null 2>&1 ; fi ; exit" 0 1 2 3 15
+trap "if [[ -d $rvm_tmp_path/ ]] && [[ -f $rvm_tmp_path/$$ ]] ; then rm -f $rvm_tmp_path/$$ > /dev/null 2>&1 ; fi ; exit" 0 1 2 3 15
 
 if [[ ! -z "$1" ]] ; then
   if [[ -s "$rvm_hooks_path/$1" ]] ; then

data/scripts/initialize

@@ -26,11 +26,12 @@ rvm_src_path="${rvm_src_path:-"$rvm_path/src"}"
 rvm_log_path="${rvm_log_path:-"$rvm_path/log"}"
 rvm_bin_path="${rvm_bin_path:-"$rvm_path/bin"}"
 rvm_gem_path="${rvm_gem_path:-"$rvm_path/gems"}"
+rvm_rubies_path="${rvm_rubies_path:-"$rvm_path/rubies"}"
 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:-/usr/local/bin}"
 rvm_gem_options="${rvm_gem_options:-"--no-rdoc --no-ri"}"
 
-export rvm_path rvm_scripts_path rvm_archives_path rvm_src_path rvm_log_path rvm_bin_path rvm_gem_path rvm_config_path rvm_tmp_path rvm_hooks_path
+export rvm_path rvm_rubies_path rvm_scripts_path rvm_archives_path rvm_src_path rvm_log_path rvm_bin_path rvm_gem_path rvm_config_path rvm_tmp_path rvm_hooks_path
 

data/scripts/install

@@ -64,7 +64,7 @@ cp -f "$source_path/README" "$rvm_path/"
 #
 # Scripts
 #
-rm -rf $rvm_path/scripts # Clear the old scripts directory so that the old style rvm- scripts are cleared out.
+rm -rf $rvm_scripts_path # Clear the old scripts directory so that the old style rvm- scripts are cleared out.
 for dir_name in config scripts examples lib hooks ; do
   mkdir -p "$rvm_path/$dir_name"
   if [[ -d "$source_path/$dir_name" ]] ; then
@@ -72,19 +72,19 @@ for dir_name in config scripts examples lib hooks ; do
   fi
 done ; unset dir_name
 
-if [[ ! -s "$rvm_path/config/user" ]] ; then
-  echo '# Users settings file, overrides db file settings and persists across installs.' >> $rvm_path/config/user
+if [[ ! -s "$rvm_config_path/user" ]] ; then
+  echo '# Users settings file, overrides db file settings and persists across installs.' >> $rvm_config_path/user
 fi
 
 #
 # Bin Scripts
 #
 # Cleanse and purge...
-rm -f $rvm_path/bin/rvm ; rm -rf $rvm_path/bin/binscripts
+rm -f $rvm_bin_path/rvm ; rm -rf $rvm_bin_path/binscripts
 for file in rvm-prompt rvm rvmsudo ; do
-  cp -f "$source_path/binscripts/$file" $rvm_path/bin/
+  cp -f "$source_path/binscripts/$file" $rvm_bin_path/
 done
-chmod +x $rvm_path/bin/*
+chmod +x $rvm_bin_path/*
 
 #
 # RC Files
@@ -101,37 +101,50 @@ if [[ ! -z "$rvm_auto_flag" ]] ; then
         fi
       fi
       if ! grep -q "scripts\/rvm" "$rcfile" ; then
-        echo "    Adding 'if [[ -s $rvm_path/scripts/rvm ]] ; then source $rvm_path/scripts/rvm ; fi' to $rcfile."
-        echo -e "\n# rvm-install added:\nif [[ -s $rvm_path/scripts/rvm ]] ; then source $rvm_path/scripts/rvm ; fi\n" >> $rcfile
+        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
       fi
     done
   fi
 fi
 
 #
-# TODO: Migrate ~/.rvm/ruby-X,jruby-X,... to ~/.rvm/rubies/
+# 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/"
+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
+      if [[ -s "$new_path/bin/$file" ]] ; then
+        sed -i -e '1,1s=.*=#!'"$new_path/bin/ruby=" "$new_path/bin/$file"
+        rm -f "$new_path/bin/$file.orig"
+        chmod +x "$new_path/bin/$file"
+      fi
+    done
+  fi
+done
+#
+# End of migration.
 #
-#rvm_rubies_path="${rvm_rubies_path:-"$rvm_path/rubies"}"
-#mkdir -p $rvm_rubies_path
-#for ruby in "$rvm_path"/ruby-* "$rvm_path"/jruby-* "$rvm_path"/mput-* "$rvm_path"/rbx-* ; do
-#  if [[ -d "$ruby" ]] ; then mv "$ruby" "$rvm_rubies_path" ; fi
-#done
 
 if [[ "root" = "$(whoami)" ]] ; then
   echo -e "\n    Symlinking rvm to $rvm_symlink_path/rvm ..."
   mkdir -p $rvm_symlink_path
-  ln -nfs $rvm_path/bin/rvm $rvm_symlink_path/rvm
-  ln -nfs $rvm_path/bin/rvmsudo $rvm_symlink_path/rvmsudo
+  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
 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."
-$rvm_path/scripts/notes
+$rvm_scripts_path/notes
 
 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 "================================================================================"
+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."
@@ -139,13 +152,8 @@ echo -e "If you have any questions, issues and/or ideas for improvement please h
 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 "\n  w$(tput setaf 2)⦿‿⦿$(tput sgr0)t!"
-echo -e "\n    ~ Wayne\n"
-echo "================================================================================"
-echo -e "Upgrades"
-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 "================================================================================"
+echo -e "\n    ~ Wayne"
+echo -e "\n********************************************************************************"
 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"

data/scripts/manage

@@ -8,7 +8,7 @@ source $rvm_scripts_path/utility
 source $rvm_scripts_path/selector
 source $rvm_scripts_path/libraries
 
-trap "rm -f $rvm_path/tmp/$$* > /dev/null 2>&1 ; exit" 0 1 2 3 15
+trap "rm -f $rvm_tmp_path/$$* > /dev/null 2>&1 ; exit" 0 1 2 3 15
 
 if [[ ! -z "$rvm_trace_flag" ]] ; then set -x ; export rvm_trace_flag ; fi
 
@@ -130,7 +130,7 @@ __rvm_install_ruby() {
           fi
 
           mv "$rvm_archives_path/macruby_nightly-latest.pkg" "$rvm_archives_path/macruby_nightly.pkg"
-          __rvm_run "macruby/extract" "sudo installer -pkg '$rvm_path/archives/macruby_nightly.pkg' -target '/'"
+          __rvm_run "macruby/extract" "sudo installer -pkg '$rvm_archives_path/macruby_nightly.pkg' -target '/'"
           mkdir -p "$rvm_ruby_home/bin"
         fi
 
@@ -148,7 +148,7 @@ PATH="$rvm_ruby_home/bin:$rvm_ruby_gem_home/bin:\$PATH" ; export PATH
 exec $macruby_path/mac$binary_name $prefix "\$@"
 RubyWrapper
 )
-          for file_name in "$rvm_ruby_home/bin/$binary_name" "$rvm_path/bin/$binary_name-$rvm_ruby_string" ; do
+          for file_name in "$rvm_ruby_home/bin/$binary_name" "$rvm_bin_path/$binary_name-$rvm_ruby_string" ; do
             rm -f $file_name
             echo "$ruby_wrapper" > $file_name
             if [[ -f $file_name ]] ; then chmod +x $file_name ; fi
@@ -196,7 +196,7 @@ RubyWrapper
           rvm_ree_options="${rvm_ree_options} --no-tcmalloc"
         fi
 
-        __rvm_run "install" "./installer -a $rvm_path/$rvm_ruby_interpreter-$rvm_ruby_version-$rvm_ruby_patch_level $rvm_ree_options --dont-install-useful-gems $rvm_ruby_configure_flags" "Installing $rvm_ruby_string, this may take a while, depending on your cpu(s)..."
+        __rvm_run "install" "./installer -a $rvm_rubies_path/$rvm_ruby_interpreter-$rvm_ruby_version-$rvm_ruby_patch_level $rvm_ree_options --dont-install-useful-gems $rvm_ruby_configure_flags" "Installing $rvm_ruby_string, this may take a while, depending on your cpu(s)..."
           result=$? ; if [[ "$result" -gt 0 ]] ; then
             $rvm_scripts_path/log "error" "There has been an error while trying to run the ree installer. Aborting the installation." ; __rvm_pushpop ; return $result
           fi
@@ -258,7 +258,7 @@ RubyWrapper
         mv "$rvm_src_path/rubinius-$rvm_ruby_version-${rvm_ruby_patch_level/^p//}" $rvm_ruby_src_path
       else
         __rvm_db "rubinius_repo_url" "rvm_ruby_repo_url"
-        #rvm_ruby_home="$rvm_path/$rvm_ruby_interpreter-$rvm_ruby_version"
+        #rvm_ruby_home="$rvm_rubies_path/$rvm_ruby_interpreter-$rvm_ruby_version"
         if [[ ! -d "$rvm_ruby_src_path" ]] || [[ ! -d "$rvm_ruby_src_path/.git" ]] ; then
           rm -rf "$rvm_ruby_src_path" ; builtin cd "$rvm_home"
           __rvm_run "rbx.repo" "git clone --depth 1 $rvm_ruby_repo_url $rvm_ruby_src_path" "Cloning $rvm_ruby_repo_url"
@@ -320,7 +320,7 @@ PATH="$rvm_ruby_home/bin:$rvm_ruby_gem_home/bin:\$PATH" ; export PATH
 exec $rvm_ruby_home/bin/rbx $prefix$binary_name "\$@"
 RubyWrapper
 )
-        for file_name in "$rvm_ruby_home/bin/$binary_name" "$rvm_path/bin/$binary_name-$rvm_ruby_string"  ; do
+        for file_name in "$rvm_ruby_home/bin/$binary_name" "$rvm_bin_path/$binary_name-$rvm_ruby_string"  ; do
           rm -f $file_name
           echo "$ruby_wrapper" > $file_name
           if [[ -f $file_name ]] ; then chmod +x $file_name ; fi
@@ -526,7 +526,7 @@ PATH="$rvm_ruby_home/bin:$rvm_ruby_gem_home/bin:\$PATH" ; export PATH
 exec mono $rvm_ruby_home/bin/ir.exe $binary_path "\$@"
 RubyWrapper
 )
-        files="$rvm_ruby_home/bin/$binary_name $rvm_path/bin/$binary_name-$rvm_ruby_string"
+        files="$rvm_ruby_home/bin/$binary_name $rvm_bin_path/$binary_name-$rvm_ruby_string"
         for file_name in $(echo $files)  ; do
           rm -f $file_name
           echo "$ruby_wrapper" > $file_name
@@ -542,7 +542,7 @@ RubyWrapper
       PATH=$(echo $PATH | tr ':' '\n' | awk '$0 !~ /rvm/' | paste -sd : -)
       PATH=$rvm_bin_path:$PATH ; export PATH
 
-      rvm_ruby_home="$rvm_path/$rvm_ruby_interpreter-$rvm_ruby_version"
+      rvm_ruby_home="$rvm_rubies_path/$rvm_ruby_interpreter-$rvm_ruby_version"
 
       if [[ ! -d "$rvm_ruby_src_path" ]] || [[ ! -d "$rvm_ruby_src_path/.git" ]] ; then
         rm -rf $rvm_ruby_src_path
@@ -729,7 +729,7 @@ __rvm_uninstall_ruby() {
   if [[ -z "$rvm_ruby_selected_flag" ]] ; then __rvm_select ; fi
 
   if [[ ! -z "$rvm_ruby_string" ]] ; then
-    for dir in $rvm_path ; do
+    for dir in $rvm_rubies_path ; do
       if [[ -d $dir/$rvm_ruby_string ]] ; then
         $rvm_scripts_path/log "info" "Removing $dir/$rvm_ruby_string..."
         rm -rf $dir/$rvm_ruby_string
@@ -750,7 +750,7 @@ __rvm_remove_ruby() {
   if [[ -z "$rvm_ruby_selected_flag" ]] ; then __rvm_select ; fi
 
   if [[ ! -z "$rvm_ruby_string" ]] ; then
-    for dir in $rvm_src_path $rvm_path ; do
+    for dir in $rvm_src_path $rvm_rubies_path ; do
       if [[ -d $dir/$rvm_ruby_string ]] ; then
         $rvm_scripts_path/log "info" "Removing $dir/$rvm_ruby_string..."
         rm -rf $dir/$rvm_ruby_string
@@ -905,7 +905,7 @@ __rvm_manage_rubies() {
           eval "__rvm_${rvm_action}_ruby"
           __rvm_unset_ruby_variables
         fi
-      done < <(\ls $rvm_path/*/bin/ruby 2> /dev/null)
+      done < <(\ls $rvm_rubies_path/*/bin/ruby 2> /dev/null)
     else
       $rvm_scripts_path/log "warn" 'Really? Install all? See "rvm list --all" and limit the selection to something more sane please :)'
     fi

data/scripts/monitor

@@ -9,7 +9,7 @@ source $rvm_scripts_path/rvm
 
 rvm_monitor_sleep="${rvm_monitor_sleep:-2}"
 
-trap "rm -f $rvm_path/tmp/$$* > /dev/null 2>&1 ; exit" 0 1 2 3 15
+trap "rm -f $rvm_tmp_path/$$* > /dev/null 2>&1 ; exit" 0 1 2 3 15
 
 timestamp() {
   if [[ "Darwin" = "$(uname)" ]] ; then

data/scripts/notes

@@ -3,6 +3,14 @@
 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/rvm

@@ -23,15 +23,16 @@ if [[ "$rvm_loaded_flag" != "1" ]] || [[ "$rvm_reload_flag" = "1" ]] ; then
     fi
   fi
   if [[ -d "$rvm_path" ]] ; then
-    source $rvm_path/scripts/array
-    source $rvm_path/scripts/utility
-    source $rvm_path/scripts/initialize
+    rvm_scripts_path="${rvm_scripts_path:-"$rvm_path/scripts"}"
+    source $rvm_scripts_path/array
+    source $rvm_scripts_path/utility
+    source $rvm_scripts_path/initialize
     source $rvm_scripts_path/version
-    source $rvm_path/scripts/selector
-    source $rvm_path/scripts/cli
-    #source $rvm_path/scripts/gems
-    source $rvm_path/scripts/libraries
-    source $rvm_path/scripts/cd
+    source $rvm_scripts_path/selector
+    source $rvm_scripts_path/cli
+    #source $rvm_scripts_path/gems
+    source $rvm_scripts_path/libraries
+    source $rvm_scripts_path/cd
 
     rvm_loaded_flag=1
 

data/scripts/rvm-install

@@ -64,7 +64,7 @@ cp -f "$source_path/README" "$rvm_path/"
 #
 # Scripts
 #
-rm -rf $rvm_path/scripts # Clear the old scripts directory so that the old style rvm- scripts are cleared out.
+rm -rf $rvm_scripts_path # Clear the old scripts directory so that the old style rvm- scripts are cleared out.
 for dir_name in config scripts examples lib hooks ; do
   mkdir -p "$rvm_path/$dir_name"
   if [[ -d "$source_path/$dir_name" ]] ; then
@@ -72,19 +72,19 @@ for dir_name in config scripts examples lib hooks ; do
   fi
 done ; unset dir_name
 
-if [[ ! -s "$rvm_path/config/user" ]] ; then
-  echo '# Users settings file, overrides db file settings and persists across installs.' >> $rvm_path/config/user
+if [[ ! -s "$rvm_config_path/user" ]] ; then
+  echo '# Users settings file, overrides db file settings and persists across installs.' >> $rvm_config_path/user
 fi
 
 #
 # Bin Scripts
 #
 # Cleanse and purge...
-rm -f $rvm_path/bin/rvm ; rm -rf $rvm_path/bin/binscripts
+rm -f $rvm_bin_path/rvm ; rm -rf $rvm_bin_path/binscripts
 for file in rvm-prompt rvm rvmsudo ; do
-  cp -f "$source_path/binscripts/$file" $rvm_path/bin/
+  cp -f "$source_path/binscripts/$file" $rvm_bin_path/
 done
-chmod +x $rvm_path/bin/*
+chmod +x $rvm_bin_path/*
 
 #
 # RC Files
@@ -101,37 +101,50 @@ if [[ ! -z "$rvm_auto_flag" ]] ; then
         fi
       fi
       if ! grep -q "scripts\/rvm" "$rcfile" ; then
-        echo "    Adding 'if [[ -s $rvm_path/scripts/rvm ]] ; then source $rvm_path/scripts/rvm ; fi' to $rcfile."
-        echo -e "\n# rvm-install added:\nif [[ -s $rvm_path/scripts/rvm ]] ; then source $rvm_path/scripts/rvm ; fi\n" >> $rcfile
+        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
       fi
     done
   fi
 fi
 
 #
-# TODO: Migrate ~/.rvm/ruby-X,jruby-X,... to ~/.rvm/rubies/
+# 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/"
+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
+      if [[ -s "$new_path/bin/$file" ]] ; then
+        sed -i -e '1,1s=.*=#!'"$new_path/bin/ruby=" "$new_path/bin/$file"
+        rm -f "$new_path/bin/$file.orig"
+        chmod +x "$new_path/bin/$file"
+      fi
+    done
+  fi
+done
+#
+# End of migration.
 #
-#rvm_rubies_path="${rvm_rubies_path:-"$rvm_path/rubies"}"
-#mkdir -p $rvm_rubies_path
-#for ruby in "$rvm_path"/ruby-* "$rvm_path"/jruby-* "$rvm_path"/mput-* "$rvm_path"/rbx-* ; do
-#  if [[ -d "$ruby" ]] ; then mv "$ruby" "$rvm_rubies_path" ; fi
-#done
 
 if [[ "root" = "$(whoami)" ]] ; then
   echo -e "\n    Symlinking rvm to $rvm_symlink_path/rvm ..."
   mkdir -p $rvm_symlink_path
-  ln -nfs $rvm_path/bin/rvm $rvm_symlink_path/rvm
-  ln -nfs $rvm_path/bin/rvmsudo $rvm_symlink_path/rvmsudo
+  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
 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."
-$rvm_path/scripts/notes
+$rvm_scripts_path/notes
 
 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 "================================================================================"
+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."
@@ -139,13 +152,8 @@ echo -e "If you have any questions, issues and/or ideas for improvement please h
 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 "\n  w$(tput setaf 2)⦿‿⦿$(tput sgr0)t!"
-echo -e "\n    ~ Wayne\n"
-echo "================================================================================"
-echo -e "Upgrades"
-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 "================================================================================"
+echo -e "\n    ~ Wayne"
+echo -e "\n********************************************************************************"
 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"

data/scripts/selector

@@ -104,7 +104,7 @@ __rvm_select() {
         maglev_url="$(__rvm_db "maglev_url")"
         rvm_url="${rvm_ruby_url:-"$maglev_url/${rvm_ruby_package_file}.${rvm_archive_extension}"}"
         rvm_gemstone_url="${rvm_gemstone_url:-"$maglev_url/${rvm_gemstone_package_file}.${rvm_archive_extension}"}"
-        export MAGLEV_HOME="$rvm_path/$rvm_ruby_string"
+        export MAGLEV_HOME="$rvm_rubies_path/$rvm_ruby_string"
       fi
     ;;
 
@@ -198,7 +198,7 @@ __rvm_select() {
     fi
 
     rvm_ruby_package_name="$rvm_ruby_string"
-    rvm_ruby_home="$rvm_path/$rvm_ruby_string"
+    rvm_ruby_home="$rvm_rubies_path/$rvm_ruby_string"
     rvm_ruby_log_path="$rvm_log_path/$rvm_ruby_string"
     rvm_ruby_src_path="$rvm_src_path/$rvm_ruby_string"
     rvm_ruby_binary="$rvm_ruby_home/bin/ruby"
@@ -250,7 +250,7 @@ __rvm_use() {
     new_path=$(echo $PATH | tr ':' '\n' | awk '$0 !~ /rvm/' | paste -sd : -)
     new_path=$rvm_bin_path:$new_path
     if [[ -s $rvm_path/system ]] ; then
-      grep "MY_RUBY_HOME='$rvm_path" "$rvm_path/system" > /dev/null
+      grep "MY_RUBY_HOME='$rvm_rubies_path" "$rvm_path/system" > /dev/null
       if [[ $? -eq 0 ]] ; then
         rm -f $rvm_path/system # 'system' should *not* point to an rvm ruby.
       else
@@ -296,7 +296,7 @@ __rvm_use() {
     fi
 
     new_path=$(echo $PATH | tr ':' '\n' | awk '$0 !~ /rvm/' | paste -sd : -)
-    new_path=$MY_RUBY_HOME/bin:$GEM_HOME/bin:$rvm_path/bin:$rvm_bin_path:$new_path
+    new_path=$MY_RUBY_HOME/bin:$GEM_HOME/bin:$rvm_bin_path:$new_path
   fi
 
   if [[ ! -z "$rvm_default_flag" ]] && [[ "default" != "$rvm_ruby_interpreter" ]] ; then
@@ -311,12 +311,12 @@ __rvm_use() {
 
     if [[ "system" = "$rvm_ruby_interpreter" ]] ; then
       rm -f $rvm_path/default
-      rm -f $rvm_path/bin/default*
+      rm -f $rvm_bin_path/default*
     else
       RUBY_VERSION="$($rvm_ruby_home/bin/ruby -v | sed 's#^\(.*\) (.*$#\1#')"
       export GEM_HOME GEM_PATH MY_RUBY_HOME RUBY_VERSION
 
-      echo "export PATH=\"$rvm_ruby_home/bin:$rvm_ruby_gem_home/bin:$rvm_path/bin:\$PATH\"" > $rvm_path/default
+      echo "export PATH=\"$rvm_ruby_home/bin:$rvm_ruby_gem_home/bin:$rvm_bin_path:\$PATH\"" > $rvm_path/default
 
       for variable in RUBY_VERSION GEM_HOME GEM_PATH MY_RUBY_HOME IRBRC rvm_ruby_string rvm_gem_set_name MAGLEV_HOME ; do
         eval "export $variable"

data/scripts/symlink

@@ -2,17 +2,17 @@
 
 if [[ "$rvm_trace_flag" -eq 1 ]] ; then set -x ; export rvm_trace_flag ; fi
 
-trap "rm -f $rvm_path/tmp/$$* > /dev/null 2>&1 ; exit" 0 1 2 3 15
+trap "rm -f $rvm_tmp_path/$$* > /dev/null 2>&1 ; exit" 0 1 2 3 15
 
 flag="$1" ; symlink_flag=0
-if [[ -s "$rvm_path/bin/$rvm_ruby_string" ]] ; then
-  rm -f ${rvm_path}/bin/${flag}_*
-  ln -fs "$rvm_path/bin/$rvm_ruby_string" "$rvm_path/bin/${flag}_ruby"
+if [[ -s "$rvm_bin_path/$rvm_ruby_string" ]] ; then
+  rm -f ${rvm_bin_path}/${flag}_*
+  ln -fs "$rvm_bin_path/$rvm_ruby_string" "$rvm_bin_path/${flag}_ruby"
   for binary in gem irb rake ; do
-    ln -fs "$rvm_ruby_home/bin/${binary}" "$rvm_path/bin/${flag}_${binary}"
+    ln -fs "$rvm_ruby_home/bin/${binary}" "$rvm_bin_path/${flag}_${binary}"
   done
   exit 0
 else
-  $rvm_scripts_path/log "error" "Cannot set ${flag}_ruby since $rvm_path/bin/$rvm_ruby_string is missing."
+  $rvm_scripts_path/log "error" "Cannot set ${flag}_ruby since $rvm_bin_path/$rvm_ruby_string is missing."
   exit 1
 fi

data/scripts/update

@@ -64,7 +64,7 @@ cp -f "$source_path/README" "$rvm_path/"
 #
 # Scripts
 #
-rm -rf $rvm_path/scripts # Clear the old scripts directory so that the old style rvm- scripts are cleared out.
+rm -rf $rvm_scripts_path # Clear the old scripts directory so that the old style rvm- scripts are cleared out.
 for dir_name in config scripts examples lib hooks ; do
   mkdir -p "$rvm_path/$dir_name"
   if [[ -d "$source_path/$dir_name" ]] ; then
@@ -72,19 +72,19 @@ for dir_name in config scripts examples lib hooks ; do
   fi
 done ; unset dir_name
 
-if [[ ! -s "$rvm_path/config/user" ]] ; then
-  echo '# Users settings file, overrides db file settings and persists across installs.' >> $rvm_path/config/user
+if [[ ! -s "$rvm_config_path/user" ]] ; then
+  echo '# Users settings file, overrides db file settings and persists across installs.' >> $rvm_config_path/user
 fi
 
 #
 # Bin Scripts
 #
 # Cleanse and purge...
-rm -f $rvm_path/bin/rvm ; rm -rf $rvm_path/bin/binscripts
+rm -f $rvm_bin_path/rvm ; rm -rf $rvm_bin_path/binscripts
 for file in rvm-prompt rvm rvmsudo ; do
-  cp -f "$source_path/binscripts/$file" $rvm_path/bin/
+  cp -f "$source_path/binscripts/$file" $rvm_bin_path/
 done
-chmod +x $rvm_path/bin/*
+chmod +x $rvm_bin_path/*
 
 #
 # RC Files
@@ -101,37 +101,50 @@ if [[ ! -z "$rvm_auto_flag" ]] ; then
         fi
       fi
       if ! grep -q "scripts\/rvm" "$rcfile" ; then
-        echo "    Adding 'if [[ -s $rvm_path/scripts/rvm ]] ; then source $rvm_path/scripts/rvm ; fi' to $rcfile."
-        echo -e "\n# rvm-install added:\nif [[ -s $rvm_path/scripts/rvm ]] ; then source $rvm_path/scripts/rvm ; fi\n" >> $rcfile
+        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
       fi
     done
   fi
 fi
 
 #
-# TODO: Migrate ~/.rvm/ruby-X,jruby-X,... to ~/.rvm/rubies/
+# 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/"
+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
+      if [[ -s "$new_path/bin/$file" ]] ; then
+        sed -i -e '1,1s=.*=#!'"$new_path/bin/ruby=" "$new_path/bin/$file"
+        rm -f "$new_path/bin/$file.orig"
+        chmod +x "$new_path/bin/$file"
+      fi
+    done
+  fi
+done
+#
+# End of migration.
 #
-#rvm_rubies_path="${rvm_rubies_path:-"$rvm_path/rubies"}"
-#mkdir -p $rvm_rubies_path
-#for ruby in "$rvm_path"/ruby-* "$rvm_path"/jruby-* "$rvm_path"/mput-* "$rvm_path"/rbx-* ; do
-#  if [[ -d "$ruby" ]] ; then mv "$ruby" "$rvm_rubies_path" ; fi
-#done
 
 if [[ "root" = "$(whoami)" ]] ; then
   echo -e "\n    Symlinking rvm to $rvm_symlink_path/rvm ..."
   mkdir -p $rvm_symlink_path
-  ln -nfs $rvm_path/bin/rvm $rvm_symlink_path/rvm
-  ln -nfs $rvm_path/bin/rvmsudo $rvm_symlink_path/rvmsudo
+  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
 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."
-$rvm_path/scripts/notes
+$rvm_scripts_path/notes
 
 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 "================================================================================"
+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."
@@ -139,13 +152,8 @@ echo -e "If you have any questions, issues and/or ideas for improvement please h
 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 "\n  w$(tput setaf 2)⦿‿⦿$(tput sgr0)t!"
-echo -e "\n    ~ Wayne\n"
-echo "================================================================================"
-echo -e "Upgrades"
-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 "================================================================================"
+echo -e "\n    ~ Wayne"
+echo -e "\n********************************************************************************"
 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"

data/scripts/utility

@@ -76,9 +76,9 @@ __rvm_debug() {
   done
 
   if [[ "root" = "$(whoami)" ]] ; then
-    debug_files="$rvm_path/default $rvm_path/system $rvm_path/config/db /etc/rvmrc /etc/gemrc"
+    debug_files="$rvm_path/default $rvm_path/system $rvm_config_path/db /etc/rvmrc /etc/gemrc"
   else
-    debug_files="$rvm_path/default $rvm_path/system $rvm_path/config/db $HOME/.rvmrc $HOME/.gemrc"
+    debug_files="$rvm_path/default $rvm_path/system $rvm_config_path/db $HOME/.rvmrc $HOME/.gemrc"
   fi
 
   for file_name in $(echo $debug_files); do
@@ -113,7 +113,7 @@ __rvm_gi() { gem install $rvm_gem_options $* ; }
 
 __rvm_run() {
   log_file_name="$1" ; command="$2" ; message="$3"
-  rvm_ruby_log_path="${rvm_ruby_log_path:-$rvm_path/log}"
+  rvm_ruby_log_path="${rvm_ruby_log_path:-$rvm_log_path}"
   mkdir -p $(dirname "$rvm_ruby_log_path/$log_file_name.log")
 
   if [[ ! -z "$message" ]] ; then $rvm_scripts_path/log "info" "$message" ; fi
@@ -147,7 +147,7 @@ __rvm_load_rvmrc() {
 }
 
 __rvm_bin_scripts() {
-  for rvm_ruby_binary in $rvm_path/*/bin/ruby ; do
+  for rvm_ruby_binary in $rvm_rubies_path/*/bin/ruby ; do
   if [[ -x "$rvm_ruby_binary" ]] ; then
     rvm_ruby_string=$(dirname "$rvm_ruby_binary" | xargs dirname | xargs basename)
     __rvm_select
@@ -169,10 +169,10 @@ PATH=$rvm_ruby_home/bin:$rvm_ruby_gem_home/bin:\$PATH ; export PATH
 exec "$rvm_ruby_binary" "\$@"
 RubyWrapper
 )
-  rm -f $rvm_path/bin/$rvm_ruby_package_name
-  echo "$ruby_wrapper" > $rvm_path/bin/$rvm_ruby_package_name
+  rm -f $rvm_bin_path/$rvm_ruby_package_name
+  echo "$ruby_wrapper" > $rvm_bin_path/$rvm_ruby_package_name
   unset ruby_wrapper
-  chmod +x $rvm_path/bin/$rvm_ruby_package_name
+  chmod +x $rvm_bin_path/$rvm_ruby_package_name
 }
 
 __rvm_load_defaults() {
@@ -232,7 +232,7 @@ __rvm_reset() {
     $rvm_scripts_path/db "$rvm_config_path/user" "$system_config" "delete"
   done ; unset system_config variable
 
-  rm -f $rvm_path/bin/ruby $rvm_path/bin/gem $rvm_path/bin/rake $rvm_path/bin/irb $rvm_path/bin/default*
+  rm -f $rvm_bin_path/ruby $rvm_bin_path/gem $rvm_bin_path/rake $rvm_bin_path/irb $rvm_bin_path/default*
 }
 
 __rvm_implode() {
@@ -281,6 +281,7 @@ __rvm_list() {
     echo -e "jruby-1.2.0\njruby-1.3.0\njruby-1.3.1\njruby(-1.4.0) # the default\njruby-head"
     echo -e "rbx(-prc1) # default\nrbx-head"
     echo -e "ree-1.8.6\nree(-1.8.7) # the default\nree-1.8.6-head\nree-1.8.7-head"
+    echo -e "maglev(-22725)"
     echo -e "mput(-head) # shyouhei head, the default mput"
     echo -e "ironruby-0.9.3 # (1.0 RC1)\nironruby-head"
     if [[ "Darwin" = "$(uname)" ]] ; then
@@ -292,11 +293,11 @@ __rvm_list() {
       current_ruby="$(echo $ruby | xargs dirname | xargs dirname | xargs basename 2> /dev/null)"
     fi
 
-    for version in $(\ls $rvm_path/ 2> /dev/null | awk '/[a-z]*-.*/ {print $NF}') ; do
+    for version in $(\ls $rvm_rubies_path/ 2> /dev/null | awk '/[a-z]*-.*/ {print $NF}') ; do
       if [[ ! -z "$(echo $version | awk '/^jruby-/')" ]] ; then
-        string="$($rvm_path/$version/bin/ruby -v | awk '{print $NF}')"
+        string="$($rvm_rubies_path/$version/bin/ruby -v | awk '{print $NF}')"
       else
-        string="[ $(file $rvm_path/$version/bin/ruby | awk '/x86.64/ {print "x86_64"} /386/ {print "i386"} /ppc/ {print "ppc"}' | tr "\n" ' ')]"
+        string="[ $(file $rvm_rubies_path/$version/bin/ruby | awk '/x86.64/ {print "x86_64"} /386/ {print "i386"} /ppc/ {print "ppc"}' | tr "\n" ' ')]"
       fi
       if [[ "$version" = "$current_ruby" ]] ; then
         echo -e "=> $(tput setaf 2)$version$(tput sgr0) $string"
@@ -309,7 +310,7 @@ __rvm_list() {
     if [[ -f "$rvm_path/default" ]] && [[ -s $rvm_path/default ]] ; then
       version=$(grep 'MY_RUBY_HOME' $rvm_path/default | awk -F"'" '{print $2}' | xargs basename)
       if [[ ! -z "$version" ]] ; then
-        string="[ $(file $rvm_path/$version/bin/ruby | awk '/x86.64/ {print "x86_64"} /386/ {print "i386"} /ppc/ {print "ppc"}' | tr "\n" ' ')]"
+        string="[ $(file $rvm_rubies_path/$version/bin/ruby | awk '/x86.64/ {print "x86_64"} /386/ {print "i386"} /ppc/ {print "ppc"}' | tr "\n" ' ')]"
         if [[ "$version" = "$current_ruby" ]] ; then
           echo -e "=> $(tput setaf 3)(default)$(tput sgr0) $(tput setaf 2)$version$(tput sgr0) $string"
           selected="1"
@@ -493,7 +494,7 @@ __rvm_do() {
       unset rvm_ruby_string rvm_ruby_version
       __rvm_ruby_do
   else # all
-    for full_binary in $rvm_path/*/bin/ruby ; do
+    for full_binary in $rvm_rubies_path/*/bin/ruby ; do
       if [[ -x "$full_binary" ]] ; then
         rvm_ruby_string="$(dirname $full_binary | xargs dirname | xargs basename)"
         __rvm_ruby_do
@@ -588,7 +589,7 @@ __rvm_benchmark() {
 __rvm_irbrc() {
   # Create the irbrc for the currently selected ruby installation.
   if [[ -d "$rvm_ruby_home" ]] && [[ ! -s "$rvm_ruby_irbrc" ]] ; then
-    cp $rvm_path/scripts/irbrc $rvm_ruby_irbrc
+    cp $rvm_scripts_path/irbrc $rvm_ruby_irbrc
   fi
 }
 
@@ -602,7 +603,7 @@ __rvm_pushpop() {
 
 __rvm_state() {
   if [[ -z "$rvm_state" ]] ; then
-    if [[ -z "$(which ruby 2>/dev/null | awk /$(basename $rvm_path)/)" ]] ; then
+    if [[ -z "$(which ruby 2>/dev/null | awk /$(basename $rvm_rubies_path)/)" ]] ; then
       rvm_state=system
     else
       rvm_state="$(dirname "$(which ruby 2>/dev/null)" | xargs dirname | xargs basename)"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rvm
 version: !ruby/object:Gem::Version 
-  version: 0.0.9999
+  version: 0.1.0
 platform: ruby
 authors: 
 - Wayne E. Seguin