rvm 0.0.90 → 0.0.91

data/install

@@ -3,13 +3,12 @@
 if [[ -f /etc/rvmrc ]] ; then source /etc/rvmrc ; fi
 if [[ -f "$HOME/.rvmrc" ]] ; then source "$HOME/.rvmrc" ; fi
 
-if [[ -z "$rvm_path" ]] ; then
+if [[ ! -d "$rvm_path" ]] || [[ "$rvm_path" = "/" ]] ; then
   unset rvm_path
   if [[ "root" = "$(whoami)" ]] ; then
     rvm_path="/usr/local/rvm"
   else
-    if [[ -d "$HOME/.rvm" ]] ; then rvm_path="$HOME/.rvm" ; fi
-    if [[ -d "/usr/local/bin/rvm" ]] && [[ -f "/usr/local/bin/rvm" ]] ; then rvm_path="${rvm_path:-"/usr/local/rvm"}" ; fi
+    rvm_path="$HOME/.rvm"
   fi
 fi
 

data/lib/VERSION.yml

@@ -1,4 +1,4 @@
 ---
 :major: 0
 :minor: 0
-:patch: 90
+:patch: 91

data/rvm.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rvm}
-  s.version = "0.0.90"
+  s.version = "0.0.91"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Wayne E. Seguin"]
-  s.date = %q{2009-12-08}
+  s.date = %q{2009-12-09}
   s.default_executable = %q{rvm-install}
   s.description = %q{Manages Ruby interpreter installations and switching between them.}
   s.email = %q{wayneeseguin@gmail.com}

data/scripts/install

@@ -3,13 +3,12 @@
 if [[ -f /etc/rvmrc ]] ; then source /etc/rvmrc ; fi
 if [[ -f "$HOME/.rvmrc" ]] ; then source "$HOME/.rvmrc" ; fi
 
-if [[ -z "$rvm_path" ]] ; then
+if [[ ! -d "$rvm_path" ]] || [[ "$rvm_path" = "/" ]] ; then
   unset rvm_path
   if [[ "root" = "$(whoami)" ]] ; then
     rvm_path="/usr/local/rvm"
   else
-    if [[ -d "$HOME/.rvm" ]] ; then rvm_path="$HOME/.rvm" ; fi
-    if [[ -d "/usr/local/bin/rvm" ]] && [[ -f "/usr/local/bin/rvm" ]] ; then rvm_path="${rvm_path:-"/usr/local/rvm"}" ; fi
+    rvm_path="$HOME/.rvm"
   fi
 fi
 

data/scripts/rvm-install

@@ -3,13 +3,12 @@
 if [[ -f /etc/rvmrc ]] ; then source /etc/rvmrc ; fi
 if [[ -f "$HOME/.rvmrc" ]] ; then source "$HOME/.rvmrc" ; fi
 
-if [[ -z "$rvm_path" ]] ; then
+if [[ ! -d "$rvm_path" ]] || [[ "$rvm_path" = "/" ]] ; then
   unset rvm_path
   if [[ "root" = "$(whoami)" ]] ; then
     rvm_path="/usr/local/rvm"
   else
-    if [[ -d "$HOME/.rvm" ]] ; then rvm_path="$HOME/.rvm" ; fi
-    if [[ -d "/usr/local/bin/rvm" ]] && [[ -f "/usr/local/bin/rvm" ]] ; then rvm_path="${rvm_path:-"/usr/local/rvm"}" ; fi
+    rvm_path="$HOME/.rvm"
   fi
 fi
 

data/scripts/update

@@ -3,13 +3,12 @@
 if [[ -f /etc/rvmrc ]] ; then source /etc/rvmrc ; fi
 if [[ -f "$HOME/.rvmrc" ]] ; then source "$HOME/.rvmrc" ; fi
 
-if [[ -z "$rvm_path" ]] ; then
+if [[ ! -d "$rvm_path" ]] || [[ "$rvm_path" = "/" ]] ; then
   unset rvm_path
   if [[ "root" = "$(whoami)" ]] ; then
     rvm_path="/usr/local/rvm"
   else
-    if [[ -d "$HOME/.rvm" ]] ; then rvm_path="$HOME/.rvm" ; fi
-    if [[ -d "/usr/local/bin/rvm" ]] && [[ -f "/usr/local/bin/rvm" ]] ; then rvm_path="${rvm_path:-"/usr/local/rvm"}" ; fi
+    rvm_path="$HOME/.rvm"
   fi
 fi
 

data/scripts/utility

@@ -357,7 +357,16 @@ __rvm_update_rvm() {
   mkdir -p "$rvm_src_path"
   __rvm_pushpop "$rvm_src_path"
 
+  ruby="$(which ruby)"
   system_ruby="$(rvm system ; which ruby 2>/dev/null)"
+  if [[ ! -x "$ruby" ]] ; then
+    if [[ ! -x "$system" ]] ; then
+      unset ruby
+    else
+      ruby=$system_ruby
+    fi
+  fi
+
   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
@@ -365,14 +374,15 @@ __rvm_update_rvm() {
       builtin cd $rvm_src_path && git clone git://github.com/wayneeseguin/rvm.git && builtin cd rvm/ && ./install
     fi
   else
-    # TODO: rvm_install_path:
-    if [ $(gem list rvm --installed) = 'true' ]; then
-        gem update rvm --no-rdoc --no-ri --quiet
+    if [[ "true" = "$($ruby -S gem list rvm --installed)" ]]; then
+      $ruby -S gem update rvm --no-rdoc --no-ri --quiet
     else
-        gem install rvm --no-rdoc --no-ri --quiet
+      $ruby -S gem install rvm --no-rdoc --no-ri --quiet
     fi
-    builtin cd "$(rvm system ; gem env | grep "\- $HOME" | awk '{print $NF}' | head -n 1)/gems/rvm-$(gem list rvm | sed 's/.*(//' | sed 's/).*//' | awk -F',' '{print $1 ; exit}')" && ./install
+    # TODO: Check all gem paths instead of simply assuming the last one...
+    builtin cd "$($ruby -S gem env | grep "\- $HOME" | awk '{print $NF}' | head -n 1)/gems/rvm-$(gem list rvm | sed 's/.*(//' | sed 's/).*//' | awk -F',' '{print $1 ; exit}')" && ./install
   fi
+  unset ruby system_ruby
   __rvm_pushpop
   __rvm_hook "after_update"
 }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rvm
 version: !ruby/object:Gem::Version 
-  version: 0.0.90
+  version: 0.0.91
 platform: ruby
 authors: 
 - Wayne E. Seguin
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-08 00:00:00 -05:00
+date: 2009-12-09 00:00:00 -05:00
 default_executable: rvm-install
 dependencies: []