rvm 0.0.90 → 0.0.91
Sign up to get free protection for your applications and to get access to all the features.
- data/install +2 -3
- data/lib/VERSION.yml +1 -1
- data/rvm.gemspec +2 -2
- data/scripts/install +2 -3
- data/scripts/rvm-install +2 -3
- data/scripts/update +2 -3
- data/scripts/utility +15 -5
- metadata +2 -2
data/install
CHANGED
@@ -3,13 +3,12 @@
|
|
3
3
|
if [[ -f /etc/rvmrc ]] ; then source /etc/rvmrc ; fi
|
4
4
|
if [[ -f "$HOME/.rvmrc" ]] ; then source "$HOME/.rvmrc" ; fi
|
5
5
|
|
6
|
-
if [[ -
|
6
|
+
if [[ ! -d "$rvm_path" ]] || [[ "$rvm_path" = "/" ]] ; then
|
7
7
|
unset rvm_path
|
8
8
|
if [[ "root" = "$(whoami)" ]] ; then
|
9
9
|
rvm_path="/usr/local/rvm"
|
10
10
|
else
|
11
|
-
|
12
|
-
if [[ -d "/usr/local/bin/rvm" ]] && [[ -f "/usr/local/bin/rvm" ]] ; then rvm_path="${rvm_path:-"/usr/local/rvm"}" ; fi
|
11
|
+
rvm_path="$HOME/.rvm"
|
13
12
|
fi
|
14
13
|
fi
|
15
14
|
|
data/lib/VERSION.yml
CHANGED
data/rvm.gemspec
CHANGED
@@ -5,11 +5,11 @@
|
|
5
5
|
|
6
6
|
Gem::Specification.new do |s|
|
7
7
|
s.name = %q{rvm}
|
8
|
-
s.version = "0.0.
|
8
|
+
s.version = "0.0.91"
|
9
9
|
|
10
10
|
s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
|
11
11
|
s.authors = ["Wayne E. Seguin"]
|
12
|
-
s.date = %q{2009-12-
|
12
|
+
s.date = %q{2009-12-09}
|
13
13
|
s.default_executable = %q{rvm-install}
|
14
14
|
s.description = %q{Manages Ruby interpreter installations and switching between them.}
|
15
15
|
s.email = %q{wayneeseguin@gmail.com}
|
data/scripts/install
CHANGED
@@ -3,13 +3,12 @@
|
|
3
3
|
if [[ -f /etc/rvmrc ]] ; then source /etc/rvmrc ; fi
|
4
4
|
if [[ -f "$HOME/.rvmrc" ]] ; then source "$HOME/.rvmrc" ; fi
|
5
5
|
|
6
|
-
if [[ -
|
6
|
+
if [[ ! -d "$rvm_path" ]] || [[ "$rvm_path" = "/" ]] ; then
|
7
7
|
unset rvm_path
|
8
8
|
if [[ "root" = "$(whoami)" ]] ; then
|
9
9
|
rvm_path="/usr/local/rvm"
|
10
10
|
else
|
11
|
-
|
12
|
-
if [[ -d "/usr/local/bin/rvm" ]] && [[ -f "/usr/local/bin/rvm" ]] ; then rvm_path="${rvm_path:-"/usr/local/rvm"}" ; fi
|
11
|
+
rvm_path="$HOME/.rvm"
|
13
12
|
fi
|
14
13
|
fi
|
15
14
|
|
data/scripts/rvm-install
CHANGED
@@ -3,13 +3,12 @@
|
|
3
3
|
if [[ -f /etc/rvmrc ]] ; then source /etc/rvmrc ; fi
|
4
4
|
if [[ -f "$HOME/.rvmrc" ]] ; then source "$HOME/.rvmrc" ; fi
|
5
5
|
|
6
|
-
if [[ -
|
6
|
+
if [[ ! -d "$rvm_path" ]] || [[ "$rvm_path" = "/" ]] ; then
|
7
7
|
unset rvm_path
|
8
8
|
if [[ "root" = "$(whoami)" ]] ; then
|
9
9
|
rvm_path="/usr/local/rvm"
|
10
10
|
else
|
11
|
-
|
12
|
-
if [[ -d "/usr/local/bin/rvm" ]] && [[ -f "/usr/local/bin/rvm" ]] ; then rvm_path="${rvm_path:-"/usr/local/rvm"}" ; fi
|
11
|
+
rvm_path="$HOME/.rvm"
|
13
12
|
fi
|
14
13
|
fi
|
15
14
|
|
data/scripts/update
CHANGED
@@ -3,13 +3,12 @@
|
|
3
3
|
if [[ -f /etc/rvmrc ]] ; then source /etc/rvmrc ; fi
|
4
4
|
if [[ -f "$HOME/.rvmrc" ]] ; then source "$HOME/.rvmrc" ; fi
|
5
5
|
|
6
|
-
if [[ -
|
6
|
+
if [[ ! -d "$rvm_path" ]] || [[ "$rvm_path" = "/" ]] ; then
|
7
7
|
unset rvm_path
|
8
8
|
if [[ "root" = "$(whoami)" ]] ; then
|
9
9
|
rvm_path="/usr/local/rvm"
|
10
10
|
else
|
11
|
-
|
12
|
-
if [[ -d "/usr/local/bin/rvm" ]] && [[ -f "/usr/local/bin/rvm" ]] ; then rvm_path="${rvm_path:-"/usr/local/rvm"}" ; fi
|
11
|
+
rvm_path="$HOME/.rvm"
|
13
12
|
fi
|
14
13
|
fi
|
15
14
|
|
data/scripts/utility
CHANGED
@@ -357,7 +357,16 @@ __rvm_update_rvm() {
|
|
357
357
|
mkdir -p "$rvm_src_path"
|
358
358
|
__rvm_pushpop "$rvm_src_path"
|
359
359
|
|
360
|
+
ruby="$(which ruby)"
|
360
361
|
system_ruby="$(rvm system ; which ruby 2>/dev/null)"
|
362
|
+
if [[ ! -x "$ruby" ]] ; then
|
363
|
+
if [[ ! -x "$system" ]] ; then
|
364
|
+
unset ruby
|
365
|
+
else
|
366
|
+
ruby=$system_ruby
|
367
|
+
fi
|
368
|
+
fi
|
369
|
+
|
361
370
|
if [[ "head" = "$rvm_ruby_revision" ]] || [[ -z "$system_ruby" ]] ; then
|
362
371
|
if [[ -d "$rvm_src_path/rvm/.git" ]] ; then
|
363
372
|
builtin cd $rvm_src_path/rvm/ && git pull origin master && ./scripts/install
|
@@ -365,14 +374,15 @@ __rvm_update_rvm() {
|
|
365
374
|
builtin cd $rvm_src_path && git clone git://github.com/wayneeseguin/rvm.git && builtin cd rvm/ && ./install
|
366
375
|
fi
|
367
376
|
else
|
368
|
-
|
369
|
-
|
370
|
-
gem update rvm --no-rdoc --no-ri --quiet
|
377
|
+
if [[ "true" = "$($ruby -S gem list rvm --installed)" ]]; then
|
378
|
+
$ruby -S gem update rvm --no-rdoc --no-ri --quiet
|
371
379
|
else
|
372
|
-
|
380
|
+
$ruby -S gem install rvm --no-rdoc --no-ri --quiet
|
373
381
|
fi
|
374
|
-
|
382
|
+
# TODO: Check all gem paths instead of simply assuming the last one...
|
383
|
+
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
|
375
384
|
fi
|
385
|
+
unset ruby system_ruby
|
376
386
|
__rvm_pushpop
|
377
387
|
__rvm_hook "after_update"
|
378
388
|
}
|
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: rvm
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.0.
|
4
|
+
version: 0.0.91
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Wayne E. Seguin
|
@@ -9,7 +9,7 @@ autorequire:
|
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
11
|
|
12
|
-
date: 2009-12-
|
12
|
+
date: 2009-12-09 00:00:00 -05:00
|
13
13
|
default_executable: rvm-install
|
14
14
|
dependencies: []
|
15
15
|
|