Permalink
Browse files

JRuby 1.5.0.RC1 is now JRuby default.

  • Loading branch information...
1 parent da0e865 commit 4d7cac629bfbe325c41e95253a3c64ccd37602f1 @wayneeseguin wayneeseguin committed Apr 16, 2010
Showing with 8 additions and 4 deletions.
  1. +2 −2 config/db
  2. +1 −0 config/md5
  3. +1 −0 scripts/manage
  4. +4 −2 scripts/selector
View
@@ -23,9 +23,9 @@ ruby_1.9.2_patch_level=preview1
ruby_1.8.5_patch_level=231
ruby_1.8.6_patch_level=399
ruby_1.8.7_patch_level=249
-jruby_version=1.4.0
+jruby_version=1.5.0.RC1
jruby_repo_url=git://github.com/jruby/jruby.git
-jruby_url=http://jruby.kenai.com/downloads
+jruby_url=http://jruby.org.s3.amazonaws.com/downloads
macruby_version=0.5
macruby_url=http://www.macruby.org/files
macruby_repo_url=git://git.macruby.org/macruby/MacRuby.git
View
@@ -55,6 +55,7 @@ MagLev-22949.Linux-x86_64.tar.gz=4556d8b38e497124add43dcd24908bac
MacRuby%200.5.zip=675454a8c7bc19d606d90a726e08427c
jruby-bin-1.3.1.tar.gz=4a95db8fc93ed7219663fbede98b6117
jruby-bin-1.4.0.tar.gz=f37322c18e9134e91e064aebb4baa4c7
+jruby-bin-1.5.0.RC1.tar.gz=47b4ca2a21659d36a2775ade0a2534c4
libiconv-1.13.1.tar.gz=7ab33ebd26687c744a37264a330bbe9a
ncurses.tar.gz=cce05daf61a64501ef6cd8da1f727ec6
openssl-0.9.8k.tar.gz=e555c6d58d276aec7fdc53363e338ab3
View
@@ -373,6 +373,7 @@ RubyWrapper
__rvm_pushpop
if [[ -z "$rvm_ruby_home" ]] || [[ "$rvm_ruby_home" = "/" ]] ; then echo "WTH?!?! rvm_ruby_home == / ??? not removing." ; return 1000000 ; fi
+
rm -rf $rvm_ruby_home
__rvm_run "install" "/bin/cp -Rf $rvm_ruby_src_path $rvm_ruby_home" "Installing JRuby to $rvm_ruby_home"
View
@@ -68,12 +68,14 @@ __rvm_select() {
rvm_ruby_repo_url="${rvm_ruby_repo_url:-$(__rvm_db "jruby_repo_url")}"
rvm_url="${rvm_ruby_repo_url:-$(__rvm_db "jruby_repo_url")}"
else
- rvm_archive_extension="zip"
+ rvm_archive_extension="tar.gz"
rvm_ruby_version="${rvm_ruby_version:-"$(__rvm_db "jruby_version")"}"
+ jruby_url="$(__rvm_db "jruby_url")"
rvm_ruby_package_file="${rvm_ruby_interpreter}-bin-${rvm_ruby_version}"
rvm_ruby_package_name="${rvm_ruby_interpreter}-${rvm_ruby_version}"
rvm_ruby_string="${rvm_ruby_interpreter}-${rvm_ruby_version}"
- rvm_url="http://jruby.org.s3.amazonaws.com/downloads/${rvm_ruby_version}/${rvm_ruby_package_file}.tar.gz"
+ rvm_url="${jruby_url}/${rvm_ruby_version}/${rvm_ruby_package_file}.tar.gz"
+ unset jruby_url
fi
alias jruby_ng="jruby --ng"
alias jruby_ng_server="jruby --ng-server"

0 comments on commit 4d7cac6

Please sign in to comment.