wayneeseguin-rvm 0.0.19 → 0.0.20
Sign up to get free protection for your applications and to get access to all the features.
- data/bash/rvm +11 -13
- data/rvm.gemspec +1 -1
- metadata +1 -1
data/bash/rvm
CHANGED
@@ -3,7 +3,7 @@
|
|
3
3
|
rvm_author="Wayne E. Seguin"
|
4
4
|
rvm_author_email="wayneeseguin@gmail.com"
|
5
5
|
rvm_website="http://rvm.beginrescueend.com/"
|
6
|
-
rvm_version="0.0.
|
6
|
+
rvm_version="0.0.21"
|
7
7
|
rvm_updated="2009.08.25"
|
8
8
|
|
9
9
|
#
|
@@ -183,7 +183,7 @@ function rvm-install-source {
|
|
183
183
|
else
|
184
184
|
if [ ! -f "$package_name.tar.gz" ] ; then
|
185
185
|
rvm-log-info "\tDownloading $package_name, this may take a while depending on your connection..."
|
186
|
-
$curl $url
|
186
|
+
eval $curl $url
|
187
187
|
fi
|
188
188
|
rvm-log-info "\tExtracting $package_name..."
|
189
189
|
tar xzf $package_name.tar.gz && cd $package_name
|
@@ -209,7 +209,7 @@ function rvm-install-source {
|
|
209
209
|
if [ -d $gem_package_name ] ; then
|
210
210
|
cd $gem_package_name
|
211
211
|
else
|
212
|
-
if [ ! -f $gem_package_name.tgz ] ; then $curl $gem_url ; fi
|
212
|
+
if [ ! -f $gem_package_name.tgz ] ; then eval $curl $gem_url ; fi
|
213
213
|
tar zxf $gem_package_name.tgz && cd $gem_package_name
|
214
214
|
fi
|
215
215
|
# Well this is fun... fix nil error on require_paths:
|
@@ -226,9 +226,7 @@ function rvm-install-source {
|
|
226
226
|
|
227
227
|
function rvm-install-ruby {
|
228
228
|
|
229
|
-
|
230
|
-
ruby_options=RUBYOPT
|
231
|
-
unset RUBYOPT
|
229
|
+
ruby_options=$RUBYOPT ; unset RUBYOPT
|
232
230
|
|
233
231
|
case "$implementation" in
|
234
232
|
|
@@ -244,7 +242,7 @@ function rvm-install-ruby {
|
|
244
242
|
else
|
245
243
|
if [ ! -f "$package_name.tar.gz" ] ; then
|
246
244
|
rvm-log-info "\tDownloading $package_name, this may take a while depending on your connection..."
|
247
|
-
$curl $url
|
245
|
+
eval $curl $url
|
248
246
|
fi
|
249
247
|
rvm-log-info "\tExtracting $package_name..."
|
250
248
|
tar xzf $package_name.tar.gz && cd $package_name
|
@@ -263,7 +261,7 @@ function rvm-install-ruby {
|
|
263
261
|
if [ -d $gem_package_name ] ; then
|
264
262
|
cd $gem_package_name
|
265
263
|
else
|
266
|
-
if [ ! -f $gem_package_name.tgz ] ; then $curl $gem_url ; fi
|
264
|
+
if [ ! -f $gem_package_name.tgz ] ; then eval $curl $gem_url ; fi
|
267
265
|
tar zxf $gem_package_name.tgz && cd $gem_package_name
|
268
266
|
fi
|
269
267
|
# Well this is fun... fix nil error on require_paths:
|
@@ -293,7 +291,7 @@ function rvm-install-ruby {
|
|
293
291
|
else
|
294
292
|
if [ ! -f "$zipfile.zip" ] ; then
|
295
293
|
rvm-log-info "\tDownloading $zipfile, this may take a while depending on your connection..."
|
296
|
-
$curl $url
|
294
|
+
eval $curl $url
|
297
295
|
fi
|
298
296
|
rvm-log-info "\tExtracting $zipfile..."
|
299
297
|
jar xf $zipfile.zip
|
@@ -328,8 +326,8 @@ function rvm-install-ruby {
|
|
328
326
|
|
329
327
|
esac
|
330
328
|
|
331
|
-
if [ ! -z $ruby_options ] ; then
|
332
|
-
RUBYOPT
|
329
|
+
if [ ! -z "$ruby_options" ] ; then
|
330
|
+
RUBYOPT=$ruby_options ; export RUBYOPT
|
333
331
|
fi
|
334
332
|
|
335
333
|
}
|
@@ -351,7 +349,7 @@ function rvm-uninstall {
|
|
351
349
|
ree)
|
352
350
|
version=${version-1.8.6}
|
353
351
|
if [ "$version" = "1.8.6" ] ; then
|
354
|
-
package_name="
|
352
|
+
package_name="ruby-enterprise-$version-${3-20090610}"
|
355
353
|
else
|
356
354
|
rvm-log-fail "Unknown Ruby Enterprise Edition version: $version"
|
357
355
|
fi
|
@@ -383,7 +381,7 @@ function rvm-uninstall {
|
|
383
381
|
if [ ! -z "$package_name" ] ; then
|
384
382
|
for path in $source_path $install_path ; do
|
385
383
|
if [ -d $path/$package_name ] ; then
|
386
|
-
rvm-log-info "Removing $path/$package_name"
|
384
|
+
rvm-log-info "Removing $path/$package_name..."
|
387
385
|
rm -rf $path/$package_name
|
388
386
|
fi
|
389
387
|
done
|
data/rvm.gemspec
CHANGED