selector in rvm-0.1.0

- old
+ new

@@ -102,11 +102,11 @@
         rvm_ruby_package_name="${rvm_ruby_interpreter}-${rvm_ruby_version}"
         rvm_ruby_string="${rvm_ruby_interpreter}-${rvm_ruby_version}"
         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
     ;;
 
     ironruby)
       unset rvm_ruby_patch_level
@@ -196,11 +196,11 @@
       rvm_major_version=$(echo $rvm_ruby_version | awk -F'.' '{ print $2 }')
       rvm_minor_version=$(echo $rvm_ruby_version | awk -F'.' '{ print $3 }')
     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"
     rvm_ruby_irbrc="$rvm_ruby_home/.irbrc"
     rvm_ruby_gem_home="${rvm_gem_path}/${rvm_ruby_string}"
@@ -248,11 +248,11 @@
 
     unset GEM_HOME GEM_PATH MY_RUBY_HOME RUBY_VERSION IRBRC
     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
         source $rvm_path/system
       fi
@@ -294,11 +294,11 @@
     if [[ ! -z "$rvm_verbose_flag" ]] ; then
       $rvm_scripts_path/log "info" "Now using $(echo $rvm_ruby_string | tr '-' ' ')"
     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
     if [[ "root" = "$(whoami)" ]] ; then
       for binary in erb gem irb rake rdoc ri ruby testrb ; do
@@ -309,15 +309,15 @@
       done
     fi
 
     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"
         eval value=\$${variable}
         if [[ ! -z "$value" ]] ; then