Permalink
Browse files

Merge branch 'master' of github.com:wayneeseguin/rvm

  • Loading branch information...
2 parents 8e88bba + b7b62db commit fa8813091f56263dbe92614d56382fb9c3c18670 @wayneeseguin wayneeseguin committed Nov 12, 2010
Showing with 12 additions and 5 deletions.
  1. +1 −1 config/db
  2. +2 −1 config/known
  3. +1 −0 config/md5
  4. +7 −2 scripts/install
  5. +1 −1 scripts/package
View
@@ -41,7 +41,7 @@ ree_1.8.6_repo_url=git://github.com/FooBarWidget/rubyenterpriseedition.git
ree_1.8.7_url=http://rvm.beginrescueend.com/src/
ree_1.8.7_repo_url=git://github.com/FooBarWidget/rubyenterpriseedition187.git
ree_1.8.7_patch_level=2010.02
-jruby_version=1.5.3
+jruby_version=1.5.5
jruby_repo_url=git://github.com/jruby/jruby.git
jruby_url=http://jruby.org.s3.amazonaws.com/downloads
macruby_version=0.7.1
View
@@ -21,7 +21,8 @@ jruby-1.3.1
jruby-1.4.0
jruby-1.5.1
jruby-1.5.2
-jruby[-1.5.3]
+jruby-1.5.3
+jruby[-1.5.5]
jruby-head
# Rubinius
View
@@ -19,6 +19,7 @@ jruby-bin-1.5.0.tar.gz=ee2b4e326e8b87858e5dd0c8e94102e6
jruby-bin-1.5.1.tar.gz=0196dcfb17354f12253eaddc1166a0ee
jruby-bin-1.5.2.tar.gz=d239deb9a108a6abbfbd6cb79cf8255b
jruby-bin-1.5.3.tar.gz=ccb0b2dbc300d8dd4ad1bd4da48b8320
+jruby-bin-1.5.5.tar.gz=8e00f7d40cbf221f733d6f7a15784e9a
libiconv-1.13.1.tar.gz=7ab33ebd26687c744a37264a330bbe9a
ncurses.tar.gz=cce05daf61a64501ef6cd8da1f727ec6
openssl-0.9.8k.tar.gz=e555c6d58d276aec7fdc53363e338ab3
View
@@ -42,7 +42,7 @@ usage()
--version : display rvm package version
- "
+ \n"
}
check_rubyopt_conditions()
@@ -192,7 +192,12 @@ while [[ $# -gt 0 ]] ; do
env | grep '^rvm_'
set -o xtrace
;;
- --help|*) usage ;;
+ --help) usage ; exit ;;
+ *)
+ echo "Unrecognized option: $token"
+ usage
+ exit
+ ;;
esac
done
View
2 scripts/package 100755 → 100644
@@ -297,6 +297,6 @@ else
"$rvm_path/scripts/log" "info" \
" 'ree_dependencies' installs zlib, ncurses, readline, openssl and iconv in this order."
"$rvm_path/scripts/log" "info" \
- " still need to add '-C --with-readline-dir=\$rvm_path/usr,--with-iconv-dir=\$rvm_path/usr,--with-zlib-dir=\$rvm_path/usr,--with-openssl-dir=\$rvm_path/usr' to 'rvm install ree'"
+ " still need to add ' --with-readline-dir=\$rvm_path/usr --with-iconv-dir=\$rvm_path/usr --with-zlib-dir=\$rvm_path/usr --with-openssl-dir=\$rvm_path/usr' to 'rvm install ree'"
exit 1
fi

0 comments on commit fa88130

Please sign in to comment.