rvm 0.0.85 → 0.0.86

data/lib/VERSION.yml

@@ -1,4 +1,4 @@
 ---
 :major: 0
 :minor: 0
-:patch: 85
+:patch: 86

data/rvm.gemspec

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

data/scripts/cli

@@ -376,7 +376,7 @@ rvm() {
     error)
       $rvm_scripts_path/log "fail" "$rvm_error_message ( see: 'rvm usage' )"
       __rvm_pushpop
-      result=1;
+      result=1
     ;;
 
     *)

data/scripts/gems

@@ -247,7 +247,7 @@ __rvm_gems_load() {
 __rvm_gemdir() {
 
   if [[ "$rvm_user_flag" -eq 1 ]] ; then
-    echo $(rvm system ; gem env | grep $HOME | awk '{print $NF}')
+    echo $(rvm system ; gem env | grep "\- $HOME" | awk '{print $NF}')
   elif [[ "$rvm_system_flag" -eq 1 ]] ; then
     echo $(rvm system ; gem env gemdir system)
   elif [[ ! -z "$rvm_ruby_string" ]] ; then

data/scripts/utility

@@ -400,13 +400,16 @@ __rvm_update() {
   fi
   if [[ ! -z "$rvm_bin_flag" ]] ; then __rvm_bin_scripts ; fi
   if [[ ! -z "$rvm_rubygems_flag" ]] ; then __rvm_rubygems_setup ; fi
-  __rvm_hook "after_update"
+
+  unset rvm_update_flag rvm_action rvm_self_flag rvm_ruby_revision rvm_bin_flag rvm_rubygems_flag
 }
 
 __rvm_update_rvm() {
   mkdir -p "$rvm_src_path"
   __rvm_pushpop "$rvm_src_path"
-  if [[ "head" = "$rvm_ruby_revision" ]] ; then
+
+  system_ruby="$(rvm system ; which ruby 2>/dev/null)"
+  if [[ "head" = "$rvm_ruby_revision" ]] || [[ -z "$system_ruby" ]] ; then
     if [[ -d "$rvm_src_path/rvm/.git" ]] ; then
       builtin cd $rvm_src_path/rvm/ && git pull origin master && ./scripts/install
     else
@@ -414,9 +417,10 @@ __rvm_update_rvm() {
     fi
   else
     # TODO: rvm_install_path:
-    gem install rvm --no-rdoc --no-ri -q rvm && $(gem env gemdir user)/bin/rvm-install && source $rvm_path/scripts/rvm
+    gem install rvm --no-rdoc --no-ri -q rvm && cd "$(rvm system ; gem env | grep "\- $HOME" | awk '{print $NF}')/gems/rvm-$(gem list rvm | sed 's/.*(//' | awk -F',' '{print $1 ; exit}')" && ./install
   fi
   __rvm_pushpop
+  __rvm_hook "after_update"
 }
 
 __rvm_reboot() {

metadata

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