rvm 0.0.7 → 0.0.8
Sign up to get free protection for your applications and to get access to all the features.
- data/bash/rvm +11 -7
- 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://github.com/wayneeseguin/rvm"
|
6
|
-
rvm_version="0.0.
|
6
|
+
rvm_version="0.0.8"
|
7
7
|
rvm_updated="2009.08.25"
|
8
8
|
|
9
9
|
#
|
@@ -145,7 +145,6 @@ function rvm-install-source {
|
|
145
145
|
*) fail "Ruby version '$version' is unknown."
|
146
146
|
esac
|
147
147
|
|
148
|
-
set -x
|
149
148
|
package_name="ruby-$major.$minor-p$level"
|
150
149
|
url="ftp://ftp.ruby-lang.org/pub/ruby/$major/$package_name.tar.gz"
|
151
150
|
|
@@ -194,8 +193,6 @@ function rvm-install-source {
|
|
194
193
|
info "Installing $gem_name"
|
195
194
|
$install_path/$package_name/bin/gem install $gem_name --no-rdoc --no-ri -q >> $install_path/$package_name/gems.install.log
|
196
195
|
done
|
197
|
-
|
198
|
-
set +x
|
199
196
|
}
|
200
197
|
|
201
198
|
function rvm-install-ruby {
|
@@ -297,12 +294,14 @@ function rvm-install-ruby {
|
|
297
294
|
|
298
295
|
function rvm-use {
|
299
296
|
|
297
|
+
implementation="${1-$implementation}"
|
300
298
|
case "$implementation" in
|
301
299
|
|
302
300
|
default)
|
303
301
|
rm -f ~/.rvm/current
|
304
302
|
unset MY_RUBY_HOME
|
305
303
|
unset GEM_HOME
|
304
|
+
unset RUBY_VERSION
|
306
305
|
;;
|
307
306
|
#leopard) MY_RUBY_HOME="/System/Library/Frameworks/Ruby.framework/Versions/Current/usr"; GEM_HOME="$HOME/.gem/ruby/1.8" ;;
|
308
307
|
|
@@ -524,7 +523,7 @@ function rvm {
|
|
524
523
|
-c|--configure) configure="$1" ; shift ;;
|
525
524
|
-m|--manager) manager="$1" ; shift ;;
|
526
525
|
-u|--gemdup) action="gemdup" ; gem_dir="$1" ; shift ;;
|
527
|
-
-d|--debug) debug=
|
526
|
+
-d|--debug) debug=1 ;;
|
528
527
|
*) rvm-usage ; return 1
|
529
528
|
esac
|
530
529
|
done
|
@@ -538,14 +537,15 @@ function rvm {
|
|
538
537
|
|
539
538
|
# TODO: Sanitize user input, ensure that there is a / a the end...
|
540
539
|
if [ "$username" = "root" ] ; then
|
541
|
-
|
540
|
+
fail "root user support is not yet implemented."
|
541
|
+
#prefix_path=${prefix-/usr/local/}
|
542
542
|
else
|
543
543
|
prefix_path=${prefix-$HOME/.}
|
544
544
|
fi
|
545
545
|
source_path="${source_path-${prefix_path}rvm/src}"
|
546
546
|
install_path="${prefix_path}rvm"
|
547
547
|
|
548
|
-
mkdir -p $source_path $install_path
|
548
|
+
mkdir -p ~/.rvm/ $source_path $install_path
|
549
549
|
|
550
550
|
if [ -f ~/.rvm/original_path ] ; then
|
551
551
|
original_path=`cat ~/.rvm/original_path`
|
@@ -555,6 +555,8 @@ function rvm {
|
|
555
555
|
original_path=$PATH
|
556
556
|
fi
|
557
557
|
|
558
|
+
if [ "$debug" = "1" ] ; then set -x ; fi
|
559
|
+
|
558
560
|
case "$action" in
|
559
561
|
install)
|
560
562
|
if [ "$implementation" = "all" ] ; then
|
@@ -595,5 +597,7 @@ function rvm {
|
|
595
597
|
return 1
|
596
598
|
esac
|
597
599
|
|
600
|
+
set +x
|
601
|
+
|
598
602
|
}
|
599
603
|
|