rvm 0.0.89 → 0.0.90
Sign up to get free protection for your applications and to get access to all the features.
- data/install +4 -3
- data/lib/VERSION.yml +1 -1
- data/rvm.gemspec +3 -4
- data/scripts/cli +16 -11
- data/scripts/gems +19 -21
- data/scripts/initialize +2 -2
- data/scripts/install +4 -3
- data/scripts/libraries +23 -18
- data/scripts/rvm +6 -7
- data/scripts/rvm-install +4 -3
- data/scripts/update +4 -3
- data/scripts/utility +15 -5
- metadata +1 -1
data/install
CHANGED
@@ -2,13 +2,14 @@
|
|
2
2
|
|
3
3
|
if [[ -f /etc/rvmrc ]] ; then source /etc/rvmrc ; fi
|
4
4
|
if [[ -f "$HOME/.rvmrc" ]] ; then source "$HOME/.rvmrc" ; fi
|
5
|
-
if [[ -z "$rvm_path" ]] ; then unset rvm_path ; fi
|
6
5
|
|
7
6
|
if [[ -z "$rvm_path" ]] ; then
|
7
|
+
unset rvm_path
|
8
8
|
if [[ "root" = "$(whoami)" ]] ; then
|
9
|
-
rvm_path="
|
9
|
+
rvm_path="/usr/local/rvm"
|
10
10
|
else
|
11
|
-
rvm_path="$
|
11
|
+
if [[ -d "$HOME/.rvm" ]] ; then rvm_path="$HOME/.rvm" ; fi
|
12
|
+
if [[ -d "/usr/local/bin/rvm" ]] && [[ -f "/usr/local/bin/rvm" ]] ; then rvm_path="${rvm_path:-"/usr/local/rvm"}" ; fi
|
12
13
|
fi
|
13
14
|
fi
|
14
15
|
|
data/lib/VERSION.yml
CHANGED
data/rvm.gemspec
CHANGED
@@ -1,11 +1,11 @@
|
|
1
1
|
# Generated by jeweler
|
2
|
-
# DO NOT EDIT THIS FILE
|
3
|
-
# Instead, edit Jeweler::Tasks in Rakefile, and run
|
2
|
+
# DO NOT EDIT THIS FILE
|
3
|
+
# Instead, edit Jeweler::Tasks in Rakefile, and run `rake gemspec`
|
4
4
|
# -*- encoding: utf-8 -*-
|
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.90"
|
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"]
|
@@ -78,4 +78,3 @@ Gem::Specification.new do |s|
|
|
78
78
|
else
|
79
79
|
end
|
80
80
|
end
|
81
|
-
|
data/scripts/cli
CHANGED
@@ -58,26 +58,22 @@ __rvm_parse_args() {
|
|
58
58
|
|
59
59
|
gems|gemset)
|
60
60
|
rvm_action="gems"
|
61
|
-
if [[ "name" = "$1" ]] || [[ "dir" = "$1" ]] || [[ "list" = "$1" ]] || [[ "empty" = "$1" ]] || [[ "delete" = "$1" ]] ; then
|
62
|
-
|
63
|
-
|
64
|
-
export rvm_${1}_flag=1 ; shift
|
61
|
+
if [[ "name" = "$1" ]] || [[ "dir" = "$1" ]] || [[ "list" = "$1" ]] || [[ "empty" = "$1" ]] || [[ "delete" = "$1" ]] || [[ "dump" = "$1" ]] || [[ "load" = "$1" ]] ; then
|
62
|
+
rvm_ruby_args="$*"
|
63
|
+
#export rvm_${1}_flag=1 ; shift
|
65
64
|
else
|
65
|
+
rvm_gem_set_name="$1" ; shift
|
66
66
|
export rvm_use_flag=1 # Default is to use the (named) gem set.
|
67
67
|
fi
|
68
68
|
;;
|
69
69
|
|
70
70
|
gemdir)
|
71
71
|
rvm_action=$rvm_token
|
72
|
+
rvm_gemdir_flag=1
|
72
73
|
if [[ "system" = "$1" ]] ; then export rvm_system_flag=1 ; shift ; fi
|
73
74
|
if [[ "user" = "$1" ]] ; then export rvm_user_flag=1 ; shift ; fi
|
74
75
|
;;
|
75
76
|
|
76
|
-
--load|load|dump|clear)
|
77
|
-
rvm_action="gems"
|
78
|
-
export rvm_${rvm_token}_flag=1
|
79
|
-
;;
|
80
|
-
|
81
77
|
-S|-e)
|
82
78
|
rvm_action="ruby"
|
83
79
|
rvm_ruby_args="$rvm_token $@"
|
@@ -361,7 +357,6 @@ rvm() {
|
|
361
357
|
result=0
|
362
358
|
case "$rvm_action" in
|
363
359
|
use) __rvm_use ; result=$? ;;
|
364
|
-
gemdir) __rvm_gemdir ; result=$? ;;
|
365
360
|
srcdir) __rvm_source_dir ; result=$? ;;
|
366
361
|
list) __rvm_list ; result=$? ;;
|
367
362
|
version) __rvm_version ; result=$? ;;
|
@@ -372,8 +367,18 @@ rvm() {
|
|
372
367
|
usage|help) __rvm_usage ; result=$? ;;
|
373
368
|
benchmark) __rvm_benchmark ; result=$? ;;
|
374
369
|
inspect) __rvm_inspect ; result=$? ;;
|
375
|
-
gems) $rvm_scripts_path/gems ${rvm_ruby_file:-$rvm_ruby_args} ; result=$? ;;
|
376
370
|
ruby|gem|rake) __rvm_do ; result=$? ;;
|
371
|
+
gemdir) $rvm_scripts_path/gems gemdir ; result=$? ;;
|
372
|
+
gems)
|
373
|
+
if [[ "$rvm_use_flag" -eq 1 ]] ; then
|
374
|
+
__rvm_gems_select
|
375
|
+
__rvm_gems_use
|
376
|
+
else
|
377
|
+
$rvm_scripts_path/gems $rvm_ruby_args
|
378
|
+
fi
|
379
|
+
result=$?
|
380
|
+
;;
|
381
|
+
|
377
382
|
monitor)
|
378
383
|
export rvm_ruby_version rvm_ruby_string
|
379
384
|
$rvm_scripts_path/monitor ; result=$?
|
data/scripts/gems
CHANGED
@@ -1,8 +1,10 @@
|
|
1
1
|
#!/usr/bin/env bash
|
2
2
|
|
3
|
-
source $rvm_path/scripts/
|
3
|
+
#source $rvm_path/scripts/rvm
|
4
4
|
source $rvm_path/scripts/utility
|
5
5
|
source $rvm_path/scripts/selector
|
6
|
+
rvm_ruby_string="${rvm_ruby_string:-system}"
|
7
|
+
__rvm_select
|
6
8
|
|
7
9
|
if [[ "$rvm_trace_flag" -eq 1 ]] ; then set -x ; export rvm_trace_flag ; fi
|
8
10
|
|
@@ -17,15 +19,11 @@ __rvm_gems_dir() {
|
|
17
19
|
}
|
18
20
|
|
19
21
|
__rvm_gems_list() {
|
20
|
-
|
21
|
-
|
22
|
-
|
23
|
-
|
24
|
-
|
25
|
-
__rvm_gems_clear() {
|
26
|
-
unset rvm_ruby_gem_home rvm_gem_set_name GEM_HOME GEM_PATH
|
27
|
-
__rvm_gems_select
|
28
|
-
__rvm_gems_use
|
22
|
+
if [[ $rvm_dir =~ rvm ]] ; then
|
23
|
+
for gemdir in $rvm_gem_path/$rvm_ruby_interpreter/$rvm_ruby_version%* ; do
|
24
|
+
echo "$gemdir" | awk -F'%' '{print $2}'
|
25
|
+
done
|
26
|
+
fi
|
29
27
|
}
|
30
28
|
|
31
29
|
__rvm_gems_delete() {
|
@@ -217,7 +215,7 @@ __rvm_gem_install() {
|
|
217
215
|
unset gem gem_prefix gem_name gem_version gem_file_name gem_postfix cache_file gem_file_name gem_string
|
218
216
|
}
|
219
217
|
|
220
|
-
|
218
|
+
__rvm_gems_gemdir() {
|
221
219
|
|
222
220
|
if [[ "$rvm_user_flag" -eq 1 ]] ; then
|
223
221
|
echo $(rvm system ; gem env | grep "\- $HOME" | awk '{print $NF}')
|
@@ -241,22 +239,22 @@ if [[ -z "$(which gem 2>/dev/null)" ]] ; then
|
|
241
239
|
return 1
|
242
240
|
fi
|
243
241
|
|
244
|
-
if [[ "
|
245
|
-
__rvm_gems_clear
|
246
|
-
elif [[ "$rvm_load_flag" -eq 1 ]] ; then
|
242
|
+
if [[ "load" = "$1" ]] ; then
|
247
243
|
__rvm_gems_load
|
248
|
-
elif [[ "
|
244
|
+
elif [[ "dump" = "$1" ]] ; then
|
249
245
|
__rvm_gems_dump
|
250
|
-
elif [[ "
|
246
|
+
elif [[ "delete" = "$1" ]] ; then
|
251
247
|
__rvm_gems_delete
|
252
|
-
elif [[ "
|
248
|
+
elif [[ "name" = "$1" ]] ; then
|
253
249
|
__rvm_gems_name
|
254
|
-
elif [[ "
|
250
|
+
elif [[ "dir" = "$1" ]] ; then
|
255
251
|
__rvm_gems_dir
|
256
|
-
elif [[ "
|
252
|
+
elif [[ "list" = "$1" ]] ; then
|
257
253
|
__rvm_gems_list
|
258
|
-
elif [[ "
|
254
|
+
elif [[ "gemdir" = "$1" ]] ; then
|
255
|
+
__rvm_gems_gemdir
|
256
|
+
elif [[ "install" = "$1" ]] ; then
|
259
257
|
__rvm_gem_install
|
260
258
|
else
|
261
|
-
|
259
|
+
$rvm_scripts_path/log "error" "gems must be passed an action as the first parameter {load,dump,delete,name,list,gemdir,install}"
|
262
260
|
fi
|
data/scripts/initialize
CHANGED
@@ -11,9 +11,9 @@ if [[ ! -z "$rvm_archflags" ]] ; then rvm_make_flags_flag=1 ; fi
|
|
11
11
|
rvm_project_rvmrc="${rvm_project_rvmrc:-1}"
|
12
12
|
rvm_project_rvmrc_default="${rvm_project_rvmrc_default:-1}"
|
13
13
|
if [[ -z "$rvm_scripts_path" ]] ; then
|
14
|
-
if [[ -d "$HOME/scripts" ]] ; then
|
14
|
+
if [[ -d "$HOME/scripts" ]] && [[ -f "/usr/local/rvm/scripts/rvm" ]]; then
|
15
15
|
rvm_scripts_path="$HOME/scripts"
|
16
|
-
elif [[ -d "/usr/local/rvm/scripts" ]] ; then
|
16
|
+
elif [[ -d "/usr/local/rvm/scripts" ]] && [[ -f "/usr/local/rvm/scripts/rvm" ]] ; then
|
17
17
|
rvm_scripts_path="/usr/local/rvm/scripts"
|
18
18
|
else
|
19
19
|
rvm_scripts_path="$rvm_path/scripts"
|
data/scripts/install
CHANGED
@@ -2,13 +2,14 @@
|
|
2
2
|
|
3
3
|
if [[ -f /etc/rvmrc ]] ; then source /etc/rvmrc ; fi
|
4
4
|
if [[ -f "$HOME/.rvmrc" ]] ; then source "$HOME/.rvmrc" ; fi
|
5
|
-
if [[ -z "$rvm_path" ]] ; then unset rvm_path ; fi
|
6
5
|
|
7
6
|
if [[ -z "$rvm_path" ]] ; then
|
7
|
+
unset rvm_path
|
8
8
|
if [[ "root" = "$(whoami)" ]] ; then
|
9
|
-
rvm_path="
|
9
|
+
rvm_path="/usr/local/rvm"
|
10
10
|
else
|
11
|
-
rvm_path="$
|
11
|
+
if [[ -d "$HOME/.rvm" ]] ; then rvm_path="$HOME/.rvm" ; fi
|
12
|
+
if [[ -d "/usr/local/bin/rvm" ]] && [[ -f "/usr/local/bin/rvm" ]] ; then rvm_path="${rvm_path:-"/usr/local/rvm"}" ; fi
|
12
13
|
fi
|
13
14
|
fi
|
14
15
|
|
data/scripts/libraries
CHANGED
@@ -25,12 +25,13 @@ __rvm_readline_install() {
|
|
25
25
|
__rvm_run "$package/configure" "./configure --prefix=$rvm_path/usr --disable-dependency-tracking --disable-static --enable-shared" "Configuring $package"
|
26
26
|
fi
|
27
27
|
|
28
|
-
if [[ "$
|
28
|
+
if [[ "$rvm_uninstall_flag" -eq 1 ]] || [[ "$rvm_remove_flag" -eq 1 ]] ; then
|
29
|
+
__rvm_run "$package/make.uninstall" "/usr/bin/make uninstall" "uninstalling $package from $rvm_path/usr"
|
30
|
+
else
|
29
31
|
__rvm_run "$package/make" "/usr/bin/make $rvm_make_flags" "Compiling $package"
|
30
32
|
__rvm_run "$package/make.install" "/usr/bin/make install" "Installing $package to $rvm_path/usr"
|
31
|
-
elif [[ "$rvm_uninstall_flag" -eq 1 ]] || [[ "$rvm_remove_flag" -eq 1 ]] ; then
|
32
|
-
__rvm_run "$package/make.uninstall" "/usr/bin/make uninstall" "uninstalling $package from $rvm_path/usr"
|
33
33
|
fi
|
34
|
+
|
34
35
|
done
|
35
36
|
__rvm_pushpop
|
36
37
|
}
|
@@ -45,12 +46,13 @@ __rvm_iconv_install() {
|
|
45
46
|
__rvm_run "$package/extract" "tar zxf $rvm_archives_path/$package-$version.$archive_format -C $rvm_src_path" "Extracting $package-$version.$archive_format"
|
46
47
|
builtin cd "$rvm_src_path/$package-$version"
|
47
48
|
__rvm_run "$package/configure" "./configure --prefix=$rvm_path/usr" "Configuring $package."
|
48
|
-
if [[ "$
|
49
|
+
if [[ "$rvm_uninstall_flag" -eq 1 ]] || [[ "$rvm_remove_flag" -eq 1 ]] ; then
|
50
|
+
__rvm_run "$package/make.uninstall" "/usr/bin/make uninstall" "uninstalling $package from $rvm_path/usr"
|
51
|
+
else
|
49
52
|
__rvm_run "$package/make" "/usr/bin/make $rvm_make_flags" "Compiling $package"
|
50
53
|
__rvm_run "$package/make.install" "/usr/bin/make install" "Installing $package to $rvm_path/usr"
|
51
|
-
elif [[ "$rvm_uninstall_flag" -eq 1 ]] || [[ "$rvm_remove_flag" -eq 1 ]] ; then
|
52
|
-
__rvm_run "$package/make.uninstall" "/usr/bin/make uninstall" "uninstalling $package from $rvm_path/usr"
|
53
54
|
fi
|
55
|
+
|
54
56
|
__rvm_pushpop
|
55
57
|
}
|
56
58
|
|
@@ -64,12 +66,13 @@ __rvm_curl_install() {
|
|
64
66
|
__rvm_run "$package/extract" "tar zxf $rvm_archives_path/$package-$version.$archive_format -C $rvm_src_path" "Extracting $package-$version.$archive_format"
|
65
67
|
builtin cd "$rvm_src_path/$package-$version"
|
66
68
|
__rvm_run "$package/configure" "./configure --prefix=$rvm_path/usr" "Configuring $package."
|
67
|
-
if [[ "$
|
69
|
+
if [[ "$rvm_uninstall_flag" -eq 1 ]] || [[ "$rvm_remove_flag" -eq 1 ]] ; then
|
70
|
+
__rvm_run "$package/make.uninstall" "/usr/bin/make uninstall" "uninstalling $package from $rvm_path/usr"
|
71
|
+
else
|
68
72
|
__rvm_run "$package/make" "/usr/bin/make $rvm_make_flags" "Compiling $package"
|
69
73
|
__rvm_run "$package/make.install" "/usr/bin/make install" "Installing $package to $rvm_path/usr"
|
70
|
-
elif [[ "$rvm_uninstall_flag" -eq 1 ]] || [[ "$rvm_remove_flag" -eq 1 ]] ; then
|
71
|
-
__rvm_run "$package/make.uninstall" "/usr/bin/make uninstall" "uninstalling $package from $rvm_path/usr"
|
72
74
|
fi
|
75
|
+
|
73
76
|
__rvm_pushpop
|
74
77
|
}
|
75
78
|
|
@@ -88,12 +91,13 @@ __rvm_openssl_install() {
|
|
88
91
|
__rvm_run "$package/extract" "tar zxf $rvm_archives_path/$package-$version.$archive_format -C $rvm_src_path" "Extracting $package-$version.$archive_format"
|
89
92
|
builtin cd "$rvm_src_path/$package-$version"
|
90
93
|
__rvm_run "$package/config" "./config --prefix=$rvm_path/usr zlib no-asm no-krb5 shared" "Configuring $package."
|
91
|
-
if [[ "$
|
94
|
+
if [[ "$rvm_uninstall_flag" -eq 1 ]] || [[ "$rvm_remove_flag" -eq 1 ]] ; then
|
95
|
+
__rvm_run "$package/make.uninstall" "/usr/bin/make uninstall" "uninstalling $package from $rvm_path/usr"
|
96
|
+
else
|
92
97
|
__rvm_run "$package/make" "/usr/bin/make $rvm_make_flags" "Compiling $package"
|
93
98
|
__rvm_run "$package/make.install" "/usr/bin/make install" "Installing $package to $rvm_path/usr"
|
94
|
-
elif [[ "$rvm_uninstall_flag" -eq 1 ]] || [[ "$rvm_remove_flag" -eq 1 ]] ; then
|
95
|
-
__rvm_run "$package/make.uninstall" "/usr/bin/make uninstall" "uninstalling $package from $rvm_path/usr"
|
96
99
|
fi
|
100
|
+
|
97
101
|
__rvm_pushpop
|
98
102
|
}
|
99
103
|
|
@@ -107,12 +111,13 @@ __rvm_zlib_install() {
|
|
107
111
|
__rvm_run "$package/extract" "tar zxf $rvm_archives_path/$package-$version.$archive_format -C $rvm_src_path" "Extracting $package-$version.$archive_format"
|
108
112
|
builtin cd "$rvm_src_path/$package-$version"
|
109
113
|
__rvm_run "$package/configure" "./configure --prefix=$rvm_path/usr" "Configuring $package."
|
110
|
-
if [[ "$
|
114
|
+
if [[ "$rvm_uninstall_flag" -eq 1 ]] || [[ "$rvm_remove_flag" -eq 1 ]] ; then
|
115
|
+
__rvm_run "$package/make.uninstall" "/usr/bin/make uninstall" "uninstalling $package from $rvm_path/usr"
|
116
|
+
else
|
111
117
|
__rvm_run "$package/make" "/usr/bin/make $rvm_make_flags" "Compiling $package"
|
112
118
|
__rvm_run "$package/make.install" "/usr/bin/make install" "Installing $package to $rvm_path/usr"
|
113
|
-
elif [[ "$rvm_uninstall_flag" -eq 1 ]] || [[ "$rvm_remove_flag" -eq 1 ]] ; then
|
114
|
-
__rvm_run "$package/make.uninstall" "/usr/bin/make uninstall" "uninstalling $package from $rvm_path/usr"
|
115
119
|
fi
|
120
|
+
|
116
121
|
__rvm_pushpop
|
117
122
|
}
|
118
123
|
|
@@ -126,11 +131,11 @@ __rvm_ncurses_install() {
|
|
126
131
|
__rvm_run "$package/extract" "tar zxf $rvm_archives_path/$package.$archive_format -C $rvm_src_path" "Extracting $package.$archive_format"
|
127
132
|
builtin cd "$rvm_src_path/$package-$version"
|
128
133
|
__rvm_run "$package/configure" "./configure --prefix=$rvm_path/usr --with-shared --disable-rpath --without-debug --without-ada --enable-safe-sprintf --enable-sigwinch --without-progs" "Configuring $package."
|
129
|
-
if [[ "$
|
134
|
+
if [[ "$rvm_uninstall_flag" -eq 1 ]] || [[ "$rvm_remove_flag" -eq 1 ]] ; then
|
135
|
+
__rvm_run "$package/make.uninstall" "/usr/bin/make uninstall" "uninstalling $package from $rvm_path/usr"
|
136
|
+
else
|
130
137
|
__rvm_run "$package/make" "/usr/bin/make $rvm_make_flags" "Compiling $package"
|
131
138
|
__rvm_run "$package/make.install" "/usr/bin/make install" "Installing $package to $rvm_path/usr"
|
132
|
-
elif [[ "$rvm_uninstall_flag" -eq 1 ]] || [[ "$rvm_remove_flag" -eq 1 ]] ; then
|
133
|
-
__rvm_run "$package/make.uninstall" "/usr/bin/make uninstall" "uninstalling $package from $rvm_path/usr"
|
134
139
|
fi
|
135
140
|
__rvm_pushpop
|
136
141
|
}
|
data/scripts/rvm
CHANGED
@@ -9,15 +9,14 @@ if [[ "$rvm_loaded_flag" != "1" ]] || [[ "$rvm_reload_flag" = "1" ]] ; then
|
|
9
9
|
|
10
10
|
if [[ -f /etc/rvmrc ]] ; then source /etc/rvmrc ; fi
|
11
11
|
if [[ -f "$HOME/.rvmrc" ]] ; then source "$HOME/.rvmrc" ; fi
|
12
|
-
if [[ -z "$rvm_path" ]] ; then unset rvm_path ; fi
|
13
12
|
|
14
|
-
if [[
|
15
|
-
rvm_path
|
16
|
-
|
17
|
-
|
18
|
-
rvm_path="${rvm_path:-$HOME/.rvm}"
|
13
|
+
if [[ -z "$rvm_path" ]] ; then
|
14
|
+
unset rvm_path
|
15
|
+
if [[ "root" = "$(whoami)" ]] ; then
|
16
|
+
rvm_path="/usr/local/rvm"
|
19
17
|
else
|
20
|
-
rvm_path="$
|
18
|
+
if [[ -d "$HOME/.rvm" ]] ; then rvm_path="$HOME/.rvm" ; fi
|
19
|
+
if [[ -d "/usr/local/bin/rvm" ]] && [[ -f "/usr/local/bin/rvm" ]] ; then rvm_path="${rvm_path:-"/usr/local/rvm"}" ; fi
|
21
20
|
fi
|
22
21
|
fi
|
23
22
|
|
data/scripts/rvm-install
CHANGED
@@ -2,13 +2,14 @@
|
|
2
2
|
|
3
3
|
if [[ -f /etc/rvmrc ]] ; then source /etc/rvmrc ; fi
|
4
4
|
if [[ -f "$HOME/.rvmrc" ]] ; then source "$HOME/.rvmrc" ; fi
|
5
|
-
if [[ -z "$rvm_path" ]] ; then unset rvm_path ; fi
|
6
5
|
|
7
6
|
if [[ -z "$rvm_path" ]] ; then
|
7
|
+
unset rvm_path
|
8
8
|
if [[ "root" = "$(whoami)" ]] ; then
|
9
|
-
rvm_path="
|
9
|
+
rvm_path="/usr/local/rvm"
|
10
10
|
else
|
11
|
-
rvm_path="$
|
11
|
+
if [[ -d "$HOME/.rvm" ]] ; then rvm_path="$HOME/.rvm" ; fi
|
12
|
+
if [[ -d "/usr/local/bin/rvm" ]] && [[ -f "/usr/local/bin/rvm" ]] ; then rvm_path="${rvm_path:-"/usr/local/rvm"}" ; fi
|
12
13
|
fi
|
13
14
|
fi
|
14
15
|
|
data/scripts/update
CHANGED
@@ -2,13 +2,14 @@
|
|
2
2
|
|
3
3
|
if [[ -f /etc/rvmrc ]] ; then source /etc/rvmrc ; fi
|
4
4
|
if [[ -f "$HOME/.rvmrc" ]] ; then source "$HOME/.rvmrc" ; fi
|
5
|
-
if [[ -z "$rvm_path" ]] ; then unset rvm_path ; fi
|
6
5
|
|
7
6
|
if [[ -z "$rvm_path" ]] ; then
|
7
|
+
unset rvm_path
|
8
8
|
if [[ "root" = "$(whoami)" ]] ; then
|
9
|
-
rvm_path="
|
9
|
+
rvm_path="/usr/local/rvm"
|
10
10
|
else
|
11
|
-
rvm_path="$
|
11
|
+
if [[ -d "$HOME/.rvm" ]] ; then rvm_path="$HOME/.rvm" ; fi
|
12
|
+
if [[ -d "/usr/local/bin/rvm" ]] && [[ -f "/usr/local/bin/rvm" ]] ; then rvm_path="${rvm_path:-"/usr/local/rvm"}" ; fi
|
12
13
|
fi
|
13
14
|
fi
|
14
15
|
|
data/scripts/utility
CHANGED
@@ -131,7 +131,7 @@ __rvm_run() {
|
|
131
131
|
|
132
132
|
__rvm_cleanup_variables() {
|
133
133
|
__rvm_unset_ruby_variables
|
134
|
-
unset rvm_action rvm_irbrc_file rvm_command rvm_error_message rvm_gem_set_name rvm_url rvm_force_flag rvm_all_flag rvm_reconfigure_flag rvm_make_flags rvm_bin_flag rvm_load_flag rvm_dump_flag rvm_self_flag rvm_gem_flag rvm_rubygems_flag rvm_debug_flag rvm_delete_flag rvm_summary_flag rvm_test_flag _rvm_spec_flag rvm_json_flag rvm_yaml_flag rvm_shebang_flag rvm_env_flag rvm_tail_flag rvm_use_flag rvm_dir_flag rvm_list_flag rvm_empty_flag rvm_file_name rvm_benchmark_flag rvm_clear_flag rvm_name_flag rvm_verbose_flag rvm_user_flag rvm_system_flag rvm_ruby_configure_flags
|
134
|
+
unset rvm_action rvm_irbrc_file rvm_command rvm_error_message rvm_gem_set_name rvm_url rvm_force_flag rvm_all_flag rvm_reconfigure_flag rvm_make_flags rvm_bin_flag rvm_load_flag rvm_dump_flag rvm_self_flag rvm_gem_flag rvm_rubygems_flag rvm_debug_flag rvm_delete_flag rvm_summary_flag rvm_test_flag _rvm_spec_flag rvm_json_flag rvm_yaml_flag rvm_shebang_flag rvm_env_flag rvm_tail_flag rvm_use_flag rvm_dir_flag rvm_list_flag rvm_empty_flag rvm_file_name rvm_benchmark_flag rvm_clear_flag rvm_name_flag rvm_verbose_flag rvm_user_flag rvm_system_flag rvm_ruby_configure_flags rvm_uninstall_flag rvm_install_flag
|
135
135
|
}
|
136
136
|
|
137
137
|
__rvm_unset_ruby_variables() {
|
@@ -681,9 +681,19 @@ __rvm_gems_select() {
|
|
681
681
|
}
|
682
682
|
|
683
683
|
__rvm_gems_use() {
|
684
|
-
|
685
|
-
|
686
|
-
|
687
|
-
|
684
|
+
if [[ -z "$rvm_ruby_selected_flag" ]] ; then __rvm_select $* ; fi
|
685
|
+
|
686
|
+
if [[ ! -z "$rvm_ruby_gem_home" ]] ; then
|
687
|
+
mkdir -p "$rvm_ruby_gem_home"
|
688
|
+
GEM_HOME="$rvm_ruby_gem_home" ; export GEM_HOME
|
689
|
+
GEM_PATH="$GEM_HOME" ; export GEM_PATH
|
690
|
+
__rvm_use
|
691
|
+
fi
|
692
|
+
}
|
693
|
+
|
694
|
+
__rvm_gems_clear() {
|
695
|
+
unset rvm_ruby_gem_home rvm_gem_set_name GEM_HOME GEM_PATH
|
696
|
+
__rvm_gems_select
|
697
|
+
__rvm_gems_use
|
688
698
|
}
|
689
699
|
|