rvm 1.0.11 → 1.0.13
Sign up to get free protection for your applications and to get access to all the features.
- data/binscripts/rvm-prompt +99 -7
- data/binscripts/rvmsudo +1 -3
- data/config/db +4 -2
- data/config/known +4 -2
- data/config/md5 +2 -0
- data/contrib/install-system-wide +2 -2
- data/contrib/r +16 -0
- data/install +86 -31
- data/lib/VERSION.yml +1 -1
- data/rvm.gemspec +2 -2
- data/scripts/array +6 -3
- data/scripts/cd +39 -10
- data/scripts/cleanup +9 -6
- data/scripts/cli +6 -5
- data/scripts/completion +2 -0
- data/scripts/db +2 -1
- data/scripts/default +6 -3
- data/scripts/disk-usage +12 -8
- data/scripts/docs +8 -4
- data/scripts/env +2 -1
- data/scripts/environment-convertor +12 -6
- data/scripts/fetch +4 -5
- data/scripts/gemsets +56 -33
- data/scripts/hash +2 -1
- data/scripts/info +18 -9
- data/scripts/install +86 -31
- data/scripts/list +22 -18
- data/scripts/manage +217 -114
- data/scripts/migrate +11 -5
- data/scripts/monitor +15 -5
- data/scripts/notes +2 -2
- data/scripts/override_gem +2 -1
- data/scripts/package +28 -15
- data/scripts/patches +6 -3
- data/scripts/patchsets +6 -3
- data/scripts/repair +48 -12
- data/scripts/rubygems +3 -2
- data/scripts/rvm-install +86 -31
- data/scripts/selector +43 -21
- data/scripts/set +10 -8
- data/scripts/snapshot +16 -6
- data/scripts/tools +8 -4
- data/scripts/update +86 -31
- data/scripts/upgrade +62 -24
- data/scripts/utility +362 -180
- data/scripts/version +5 -2
- data/scripts/wrapper +40 -20
- metadata +4 -4
data/binscripts/rvm-prompt
CHANGED
@@ -1,13 +1,22 @@
|
|
1
1
|
#!/usr/bin/env bash
|
2
2
|
|
3
3
|
add(){
|
4
|
+
|
4
5
|
token=${1:-""}
|
6
|
+
|
5
7
|
eval "${token}_flag=1" ; shift
|
8
|
+
|
6
9
|
if [[ -n "$format" ]] ; then
|
10
|
+
|
7
11
|
format="${format}-\$${token}"
|
12
|
+
|
8
13
|
else
|
14
|
+
|
9
15
|
format="\$${token}"
|
16
|
+
|
10
17
|
fi
|
18
|
+
|
19
|
+
return 0
|
11
20
|
}
|
12
21
|
|
13
22
|
rvm_gemset_separator="${rvm_gemset_separator:-"@"}"
|
@@ -15,98 +24,181 @@ rvm_gemset_separator="${rvm_gemset_separator:-"@"}"
|
|
15
24
|
ruby=$(command -v ruby)
|
16
25
|
|
17
26
|
if [[ -n "$ruby" && -n "$(echo "$ruby" | awk '/rvm/{print}')" ]] ; then
|
27
|
+
|
18
28
|
unset format
|
29
|
+
|
19
30
|
while [[ $# -gt 0 ]] ; do
|
31
|
+
|
20
32
|
token="$1" ; shift
|
33
|
+
|
21
34
|
case "$token" in
|
35
|
+
|
22
36
|
i|interpreter) add "interpreter" ;;
|
37
|
+
|
23
38
|
v|version) add "version" ;;
|
39
|
+
|
24
40
|
p|patchlevel) add "patchlevel" ;;
|
41
|
+
|
25
42
|
r|revision) add "revision" ;;
|
43
|
+
|
26
44
|
a|architecture) add "architecture" ;;
|
45
|
+
|
27
46
|
g|gemset) add "gemset" ;;
|
47
|
+
|
28
48
|
u|unicode) add "unicode" ;;
|
49
|
+
|
29
50
|
s|system) add "system" ;;
|
51
|
+
|
30
52
|
-d|--no-default) no_default=1 ;;
|
53
|
+
|
31
54
|
*) echo "Unrecognized command line option '$token' for $0" ; exit 1 ;;
|
55
|
+
|
32
56
|
esac
|
57
|
+
|
33
58
|
done
|
34
59
|
|
60
|
+
|
35
61
|
if [[ -z "$format" ]] ; then
|
62
|
+
|
36
63
|
add "interpreter"
|
64
|
+
|
37
65
|
add "version"
|
66
|
+
|
38
67
|
add "patchlevel"
|
68
|
+
|
39
69
|
add "gemset"
|
70
|
+
|
40
71
|
fi
|
41
72
|
|
42
73
|
ruby_string=$(dirname "$ruby" | xargs dirname | xargs basename)
|
43
74
|
|
44
|
-
|
45
|
-
|
75
|
+
default_alias="$(rvm alias show default)"
|
76
|
+
|
77
|
+
identifier="$(rvm tools identifier)"
|
78
|
+
|
79
|
+
# Do not display anything if no default flag was provided
|
80
|
+
# and we are using the default ruby
|
81
|
+
if [[ -n "$no_default" && "$identifier" = "$default_alias" ]]; then
|
82
|
+
|
46
83
|
exit 0
|
84
|
+
|
47
85
|
fi
|
48
86
|
|
87
|
+
strings=(${ruby_string//-/ })
|
88
|
+
|
49
89
|
if [[ ${interpreter_flag:-0} -gt 0 || -n "$unicode_flag" ]] ; then
|
50
|
-
|
90
|
+
|
91
|
+
interpreter=${strings[0]}
|
92
|
+
|
51
93
|
fi
|
52
94
|
|
53
95
|
if [[ ${version_flag:-0} -gt 0 || -n "$unicode_flag" ]] ; then
|
54
|
-
|
96
|
+
|
97
|
+
version=${strings[1]}
|
98
|
+
|
55
99
|
fi
|
56
100
|
|
57
|
-
if [[ ${
|
58
|
-
|
101
|
+
if [[ ${#strings[@]} -gt 2 ]] ; then
|
102
|
+
|
103
|
+
if [[ ${patchlevel_flag:-0} -gt 0 ]] ; then
|
104
|
+
|
105
|
+
patchlevel=${strings[2]}
|
106
|
+
|
107
|
+
fi
|
108
|
+
|
59
109
|
fi
|
60
110
|
|
61
111
|
if [[ ${architecture_flag:-0} -gt 0 ]] ; then
|
112
|
+
|
62
113
|
architecture="$(echo "$(ruby -v)" | sed 's/^.*\[//' | sed 's/\].*$//')"
|
114
|
+
|
63
115
|
fi
|
64
116
|
|
65
117
|
if [[ ${gemset_flag:-0} -gt 0 ]] ; then
|
118
|
+
|
66
119
|
case "${GEM_HOME:-""}" in
|
120
|
+
|
67
121
|
*${rvm_gemset_separator:-"@"}*)
|
122
|
+
|
68
123
|
gemset="${rvm_gemset_separator:-"@"}${GEM_HOME/*${rvm_gemset_separator:-"@"}/}"
|
124
|
+
|
69
125
|
;;
|
126
|
+
|
70
127
|
esac
|
128
|
+
|
71
129
|
fi
|
72
130
|
|
73
131
|
if [[ ${unicode_flag:-0} -gt 0 ]] ; then
|
132
|
+
|
74
133
|
case "$interpreter" in
|
134
|
+
|
75
135
|
jruby) unicode="☯" ;;
|
136
|
+
|
76
137
|
rbx) unicode="☃" ;;
|
138
|
+
|
77
139
|
ree) unicode="✈" ;;
|
140
|
+
|
78
141
|
macruby) unicode="⌘" ;;
|
142
|
+
|
79
143
|
maglev) unicode="㎖" ;;
|
144
|
+
|
80
145
|
ironruby) unicode="♭" ;;
|
146
|
+
|
81
147
|
mput) unicode="⎈" ;;
|
148
|
+
|
82
149
|
system) unicode="➆" ;;
|
150
|
+
|
83
151
|
ruby)
|
152
|
+
|
84
153
|
case ${version:-""} in
|
154
|
+
|
85
155
|
1.8.6) unicode="❻" ;;
|
156
|
+
|
86
157
|
1.8.7) unicode="❼" ;;
|
158
|
+
|
87
159
|
1.9.1) unicode="❶" ;;
|
160
|
+
|
88
161
|
1.9.2) unicode="❷" ;;
|
162
|
+
|
89
163
|
*) unicode="♢" ;;
|
164
|
+
|
90
165
|
esac ;;
|
166
|
+
|
91
167
|
*) unicode="♢" ;;
|
168
|
+
|
92
169
|
esac
|
93
170
|
|
94
171
|
if echo "$ruby_string" | \grep -q '-head' ; then
|
172
|
+
|
95
173
|
unicode="${unicode}〠"
|
174
|
+
|
96
175
|
fi
|
176
|
+
|
97
177
|
fi
|
98
178
|
|
99
179
|
eval "prompt=\"$format\""
|
100
180
|
|
101
|
-
echo "$prompt"
|
181
|
+
echo "$prompt" \
|
182
|
+
| sed -e 's#^[[:space:]]*-*##g' \
|
183
|
+
-e 's#--*#-#g' \
|
184
|
+
-e 's#-*[[:space:]]*$##' \
|
185
|
+
-e 's#-'${rvm_gemset_separator:-"@"}'#'${rvm_gemset_separator:-"@"}'#'
|
186
|
+
|
102
187
|
|
103
188
|
else
|
189
|
+
|
104
190
|
while [[ $# -gt 0 ]] ; do
|
191
|
+
|
105
192
|
token="$1" ; shift
|
193
|
+
|
106
194
|
case "$token" in
|
195
|
+
|
107
196
|
s|system) echo "system" ;;
|
197
|
+
|
108
198
|
esac
|
199
|
+
|
109
200
|
done
|
201
|
+
|
110
202
|
fi
|
111
203
|
|
112
204
|
exit 0
|
data/binscripts/rvmsudo
CHANGED
data/config/db
CHANGED
@@ -26,11 +26,13 @@ rubygems_version=1.3.7
|
|
26
26
|
rubygems_1.3.5_url=http://rubyforge.org/frs/download.php/60718
|
27
27
|
rubygems_1.3.6_url=http://rubyforge.org/frs/download.php/69365
|
28
28
|
rubygems_1.3.7_url=http://rubyforge.org/frs/download.php/70696
|
29
|
-
rbx_version=1.0
|
29
|
+
rbx_version=1.1.0
|
30
30
|
rbx_1.0.0_patch_level=20100514
|
31
31
|
rbx_1.0.1_patch_level=20100603
|
32
|
+
rbx_1.1.0_patch_level=20100923
|
32
33
|
rbx_url=http://asset.rubini.us
|
33
34
|
rubinius_repo_url=git://github.com/evanphx/rubinius.git
|
35
|
+
http://rubini.us/download/latest
|
34
36
|
ree_version=1.8.7
|
35
37
|
ree_configure_flags=--dont-install-useful-gems
|
36
38
|
ree_1.8.6_patch_level=20090610
|
@@ -39,7 +41,7 @@ ree_1.8.6_repo_url=git://github.com/FooBarWidget/rubyenterpriseedition.git
|
|
39
41
|
ree_1.8.7_url=http://rubyforge.org/frs/download.php/71096
|
40
42
|
ree_1.8.7_repo_url=git://github.com/FooBarWidget/rubyenterpriseedition187.git
|
41
43
|
ree_1.8.7_patch_level=2010.02
|
42
|
-
jruby_version=1.5.
|
44
|
+
jruby_version=1.5.3
|
43
45
|
jruby_repo_url=git://github.com/jruby/jruby.git
|
44
46
|
jruby_url=http://jruby.org.s3.amazonaws.com/downloads
|
45
47
|
macruby_version=0.6
|
data/config/known
CHANGED
data/config/md5
CHANGED
@@ -3,6 +3,7 @@ rubinius-1.0.0-rc4-20100331.tar.gz=c631131cc9542c548b4fc3791d8aa6b2
|
|
3
3
|
rubinius-1.0.0-rc5-20100510.tar.gz=d4fbb5b01aaeee3948cbe1cd38236524
|
4
4
|
rubinius-1.0.0-20100514.tar.gz=b05f4e791d3712c5a50b3d210dac6eb0
|
5
5
|
rubinius-1.0.1-20100603.tar.gz=eb185703c7ae0c0210e8dcb7f783ee8e
|
6
|
+
rubinius-1.1.0-20100923.tar.gz=e2ae16238b201de09975abe19da09ea9
|
6
7
|
ruby-1.8.5-p115.tar.gz=20ca6cc87eb077296806412feaac0356
|
7
8
|
ruby-1.8.5-p231.tar.gz=e900cf225d55414bffe878f00a85807c
|
8
9
|
ruby-1.8.6-p286.tar.gz=797ea136fe43e4286c9362ee4516674e
|
@@ -69,6 +70,7 @@ jruby-bin-1.5.0.RC3.tar.gz=9c2758600de903b8ca07cb1341f4f1b3
|
|
69
70
|
jruby-bin-1.5.0.tar.gz=ee2b4e326e8b87858e5dd0c8e94102e6
|
70
71
|
jruby-bin-1.5.1.tar.gz=0196dcfb17354f12253eaddc1166a0ee
|
71
72
|
jruby-bin-1.5.2.tar.gz=d239deb9a108a6abbfbd6cb79cf8255b
|
73
|
+
jruby-bin-1.5.3.tar.gz=ccb0b2dbc300d8dd4ad1bd4da48b8320
|
72
74
|
libiconv-1.13.1.tar.gz=7ab33ebd26687c744a37264a330bbe9a
|
73
75
|
ncurses.tar.gz=cce05daf61a64501ef6cd8da1f727ec6
|
74
76
|
openssl-0.9.8k.tar.gz=e555c6d58d276aec7fdc53363e338ab3
|
data/contrib/install-system-wide
CHANGED
data/contrib/r
CHANGED
@@ -7,22 +7,38 @@ r() {
|
|
7
7
|
local action args
|
8
8
|
|
9
9
|
action="$1" ; shift
|
10
|
+
|
10
11
|
args="$@"
|
11
12
|
|
12
13
|
case "$action" in
|
14
|
+
|
13
15
|
c) action=console ;;
|
16
|
+
|
14
17
|
db) action=dbconsole ;;
|
18
|
+
|
15
19
|
g) action=generate ;;
|
20
|
+
|
16
21
|
h|help) action="-h" ;;
|
22
|
+
|
17
23
|
esac
|
18
24
|
|
19
25
|
if [[ -s config.ru ]] ; then
|
26
|
+
|
20
27
|
ruby ./script/rails $args
|
28
|
+
|
21
29
|
else
|
30
|
+
|
22
31
|
if [[ -s ./script/$action ]] ; then
|
32
|
+
|
23
33
|
ruby ./script/$action $args
|
34
|
+
|
24
35
|
else
|
36
|
+
|
25
37
|
printf "ERROR: Missing script ./script/$action !!!"
|
38
|
+
|
26
39
|
fi
|
40
|
+
|
27
41
|
fi
|
42
|
+
|
43
|
+
return 0
|
28
44
|
}
|
data/install
CHANGED
@@ -1,10 +1,13 @@
|
|
1
1
|
#!/usr/bin/env bash
|
2
2
|
|
3
3
|
set -o errtrace
|
4
|
+
set -o errexit
|
5
|
+
|
4
6
|
export PS4='+[${BASH_SOURCE}] : ${LINENO} : ${FUNCNAME[0]:+${FUNCNAME[0]}() $ }'
|
5
7
|
|
6
8
|
if [[ -z "$rvm_selfcontained" ]]; then
|
7
|
-
if [[ "root" = "$(whoami)"
|
9
|
+
if [[ "root" = "$(whoami)" \
|
10
|
+
|| -n "$rvm_prefix" && "$rvm_prefix" != "$HOME"/* ]]; then
|
8
11
|
export rvm_selfcontained=0
|
9
12
|
else
|
10
13
|
export rvm_selfcontained=1
|
@@ -15,34 +18,49 @@ unset rvm_auto_flag
|
|
15
18
|
|
16
19
|
install_source_path="$(dirname "$0" | sed 's#\/scripts$##')"
|
17
20
|
|
18
|
-
if [[ -d "$install_source_path/scripts"
|
21
|
+
if [[ -d "$install_source_path/scripts" \
|
22
|
+
&& -s "$install_source_path/scripts/utility" ]] ; then
|
19
23
|
builtin cd "$install_source_path"
|
20
24
|
fi
|
21
25
|
|
22
26
|
source scripts/version
|
23
27
|
source scripts/utility
|
24
28
|
|
25
|
-
usage()
|
29
|
+
usage()
|
30
|
+
{
|
26
31
|
printf "
|
27
32
|
Usage:
|
33
|
+
|
28
34
|
${0} [options]
|
29
35
|
|
30
36
|
options:
|
37
|
+
|
31
38
|
--auto : Automatically update shell profile files.
|
39
|
+
|
32
40
|
--prefix : Installation prefix directory.
|
41
|
+
|
33
42
|
--help : Display help/usage (this) message
|
43
|
+
|
34
44
|
--version : display rvm package version
|
45
|
+
|
35
46
|
"
|
36
47
|
}
|
37
48
|
|
38
|
-
check_rubyopt_conditions()
|
49
|
+
check_rubyopt_conditions()
|
50
|
+
{
|
39
51
|
if [[ -n "${RUBYOPT:-""}" ]]; then
|
40
|
-
printf "
|
41
|
-
|
52
|
+
printf "
|
53
|
+
|
54
|
+
WARNING: You have RUBYOPT set in your current environment.
|
55
|
+
This may cause rubies to not work as you expect them to as it is not supported
|
56
|
+
by all of them If errors show up, please try unsetting RUBYOPT first.
|
57
|
+
|
58
|
+
"
|
42
59
|
fi
|
43
60
|
}
|
44
61
|
|
45
|
-
andand_return_instructions()
|
62
|
+
andand_return_instructions()
|
63
|
+
{
|
46
64
|
printf "
|
47
65
|
This means that if you see something like:
|
48
66
|
|
@@ -63,7 +81,8 @@ EOF - This marks the end of the .bashrc file
|
|
63
81
|
"
|
64
82
|
}
|
65
83
|
|
66
|
-
installation_complete()
|
84
|
+
installation_complete()
|
85
|
+
{
|
67
86
|
printf "
|
68
87
|
You must now complete the install by loading RVM in new shells.
|
69
88
|
|
@@ -91,7 +110,8 @@ installation_complete() {
|
|
91
110
|
\n"
|
92
111
|
}
|
93
112
|
|
94
|
-
andand_return_warning()
|
113
|
+
andand_return_warning()
|
114
|
+
{
|
95
115
|
printf "
|
96
116
|
WARNING: you have a 'return' statement in your ~/.bashrc
|
97
117
|
This could cause some features of RVM to not work.
|
@@ -104,7 +124,8 @@ andand_return_warning() {
|
|
104
124
|
\n"
|
105
125
|
}
|
106
126
|
|
107
|
-
thank_you()
|
127
|
+
thank_you()
|
128
|
+
{
|
108
129
|
printf "
|
109
130
|
${name:-"$(whoami)"},
|
110
131
|
|
@@ -135,7 +156,8 @@ or opening a new shell
|
|
135
156
|
"
|
136
157
|
}
|
137
158
|
|
138
|
-
upgrade_notes()
|
159
|
+
upgrade_notes()
|
160
|
+
{
|
139
161
|
printf "
|
140
162
|
|
141
163
|
Upgrade Notes
|
@@ -187,14 +209,23 @@ fi
|
|
187
209
|
|
188
210
|
source scripts/initialize
|
189
211
|
|
190
|
-
if grep -q 'scripts/rvm' "$HOME"/.bash* 2>/dev/null
|
212
|
+
if grep -q 'scripts/rvm' "$HOME"/.bash* 2>/dev/null \
|
213
|
+
|| grep -q 'scripts/rvm' "$HOME"/.zsh* 2>/dev/null ; then
|
214
|
+
|
191
215
|
if [[ -d "$rvm_path" ]] && [[ -s "${rvm_path}/scripts/rvm" ]] ; then
|
216
|
+
|
192
217
|
export upgrade_flag=1
|
218
|
+
|
193
219
|
else
|
220
|
+
|
194
221
|
export upgrade_flag=0
|
222
|
+
|
195
223
|
fi
|
224
|
+
|
196
225
|
else
|
226
|
+
|
197
227
|
export upgrade_flag=0
|
228
|
+
|
198
229
|
fi
|
199
230
|
|
200
231
|
__rvm_initialize
|
@@ -237,7 +268,17 @@ else
|
|
237
268
|
|
238
269
|
fi
|
239
270
|
|
240
|
-
directories=(
|
271
|
+
directories=(
|
272
|
+
"${rvm_archives_path:-"$rvm_path/archives"}"
|
273
|
+
"${rvm_src_path:-"$rvm_path/src"}"
|
274
|
+
"${rvm_log_path:-"$rvm_path/log"}"
|
275
|
+
"$rvm_bin_path"
|
276
|
+
"${rvm_gems_path:-"$rvm_path/gems"}"
|
277
|
+
"${rvm_rubies_path:-"$rvm_path/rubies"}"
|
278
|
+
"$rvm_path/config"
|
279
|
+
"${rvm_tmp_path:-"$rvm_path/tmp"}"
|
280
|
+
"$rvm_path/bin"
|
281
|
+
)
|
241
282
|
|
242
283
|
for directory in "${directories[@]}" ; do
|
243
284
|
|
@@ -277,7 +318,8 @@ for dir_name in config scripts examples lib hooks help patches; do
|
|
277
318
|
done
|
278
319
|
|
279
320
|
if [[ ! -s "$rvm_path/config/user" ]] ; then
|
280
|
-
echo '#
|
321
|
+
echo '# User settings, overrides db settings and persists across installs.' \
|
322
|
+
>> "$rvm_path/config/user"
|
281
323
|
fi
|
282
324
|
|
283
325
|
scripts=(monitor match log install color db fetch log set package)
|
@@ -321,9 +363,12 @@ if [[ ${rvm_auto_flag:-0} -eq 1 ]] ; then
|
|
321
363
|
|
322
364
|
if ! grep -q '.profile' "$rcfile" ; then
|
323
365
|
|
324
|
-
echo " Adding
|
366
|
+
echo " Adding profile sourcing line to $rcfile."
|
325
367
|
|
326
|
-
printf "
|
368
|
+
printf "
|
369
|
+
# rvm-install added line:
|
370
|
+
[[ -s \$HOME/.profile ]] && source \$HOME/.profile
|
371
|
+
" >> "$rcfile"
|
327
372
|
|
328
373
|
fi
|
329
374
|
|
@@ -331,9 +376,12 @@ if [[ ${rvm_auto_flag:-0} -eq 1 ]] ; then
|
|
331
376
|
|
332
377
|
if ! grep -q "scripts\/rvm" "$rcfile" ; then
|
333
378
|
|
334
|
-
echo " Adding
|
379
|
+
echo " Adding rvm loading line to $rcfile."
|
335
380
|
|
336
|
-
printf "
|
381
|
+
printf "
|
382
|
+
# rvm-install added:
|
383
|
+
[[ -s \"$rvm_path/.rvm/scripts/rvm\" ]] && . \"$rvm_path/.rvm/scripts/rvm\"
|
384
|
+
" >> "$rcfile"
|
337
385
|
|
338
386
|
fi
|
339
387
|
|
@@ -352,9 +400,10 @@ if [[ -d gemsets/ ]] ; then
|
|
352
400
|
|
353
401
|
fi
|
354
402
|
|
355
|
-
for gemset_file in $(
|
403
|
+
for gemset_file in $(find "$PWD/gemsets" -iname '*.gems' | sed 's/^\.\///') ; do
|
356
404
|
|
357
|
-
|
405
|
+
cwd="${PWD//\//\\/}\/gemsets\/"
|
406
|
+
destination="$rvm_path/gemsets/${gemset_file/$cwd}"
|
358
407
|
|
359
408
|
destination_path="$(dirname "$destination")"
|
360
409
|
|
@@ -362,7 +411,7 @@ if [[ -d gemsets/ ]] ; then
|
|
362
411
|
|
363
412
|
mkdir -p "$destination_path"
|
364
413
|
|
365
|
-
cp "
|
414
|
+
cp "$gemset_file" "$destination"
|
366
415
|
|
367
416
|
fi
|
368
417
|
|
@@ -404,7 +453,8 @@ fi
|
|
404
453
|
#
|
405
454
|
mkdir -p "${rvm_rubies_path:-"$rvm_path/rubies"}/"
|
406
455
|
|
407
|
-
for ruby in $rvm_path/ruby-* $rvm_path/jruby-* $rvm_path/mput-*
|
456
|
+
for ruby in $rvm_path/ruby-* $rvm_path/jruby-* $rvm_path/mput-* \
|
457
|
+
$rvm_path/rbx-* $rvm_path/maglev-* $rvm_path/ree-* ; do
|
408
458
|
|
409
459
|
if [[ -d "$ruby" ]] ; then
|
410
460
|
|
@@ -416,7 +466,8 @@ for ruby in $rvm_path/ruby-* $rvm_path/jruby-* $rvm_path/mput-* $rvm_path/rbx-*
|
|
416
466
|
|
417
467
|
if [[ -s "$new_path/bin/$file" ]] ; then
|
418
468
|
|
419
|
-
sed -e '1,1s=.*=#!'"${new_path}/bin/ruby=" "${new_path}/bin/${file}"
|
469
|
+
sed -e '1,1s=.*=#!'"${new_path}/bin/ruby=" "${new_path}/bin/${file}" \
|
470
|
+
> "${new_path}/bin/${file}.new"
|
420
471
|
|
421
472
|
mv -f "$new_path/bin/$file.new" "$new_path/bin/$file"
|
422
473
|
|
@@ -481,7 +532,8 @@ done
|
|
481
532
|
# Move from legacy defaults to the new, alias based system.
|
482
533
|
if [[ -s "$rvm_path/config/default" ]]; then
|
483
534
|
|
484
|
-
original_version="$(basename "$(grep GEM_HOME "$rvm_path/config/default"
|
535
|
+
original_version="$(basename "$(grep GEM_HOME "$rvm_path/config/default" \
|
536
|
+
| awk -F"'" '{print $2}' | sed "s#\%#${rvm_gemset_separator:-"@"}#")")"
|
485
537
|
|
486
538
|
if [[ -n "$original_version" ]]; then
|
487
539
|
|
@@ -505,19 +557,24 @@ mkdir -p "${rvm_bin_path:-"$rvm_path/bin"}"
|
|
505
557
|
files=(rvm rvmsudo rvm-shell rvm-auto-ruby)
|
506
558
|
for file in "${files[@]}" ; do
|
507
559
|
|
508
|
-
[[ -s "${rvm_bin_path:-"$rvm_path/bin"}/$file" ]]
|
560
|
+
if [[ -s "${rvm_bin_path:-"$rvm_path/bin"}/$file" ]] ; then
|
561
|
+
|
562
|
+
chmod +x "${rvm_bin_path:-"$rvm_path/bin"}/$file"
|
563
|
+
|
564
|
+
fi
|
509
565
|
|
510
566
|
done
|
511
567
|
|
512
568
|
printf "\n Copying manpages into place."
|
513
569
|
|
514
|
-
files=($(builtin cd "$install_source_path/man" ;
|
570
|
+
files=($(builtin cd "$install_source_path/man" ; \
|
571
|
+
find . -maxdepth 1 -mindepth 1 -type f -print))
|
515
572
|
|
516
573
|
for file in "${files[@]//.\/}" ; do
|
517
574
|
|
518
|
-
rm -rf "$rvm_man_path/$
|
575
|
+
rm -rf "$rvm_man_path/$file"
|
519
576
|
|
520
|
-
cp -R "$install_source_path/man/$
|
577
|
+
cp -R "$install_source_path/man/$file" "$rvm_man_path/"
|
521
578
|
|
522
579
|
done
|
523
580
|
|
@@ -537,7 +594,7 @@ if [[ ${#files[@]} -gt 0 ]] ; then
|
|
537
594
|
fi
|
538
595
|
|
539
596
|
if [[ $upgrade_flag -eq 0 ]] ; then
|
540
|
-
chmod +x ./
|
597
|
+
chmod +x ./scripts/notes # Sometimes things don't clone properly :/
|
541
598
|
./scripts/notes
|
542
599
|
fi
|
543
600
|
|
@@ -549,8 +606,6 @@ if [[ ${upgrade_flag:-0} -eq 1 ]] ; then
|
|
549
606
|
|
550
607
|
check_rubyopt_conditions
|
551
608
|
|
552
|
-
regenerate_wrappers
|
553
|
-
|
554
609
|
printf "\nUpgrade of RVM in $rvm_path/ is complete.\n\n"
|
555
610
|
|
556
611
|
else
|