Merge master

This commit is contained in:
Sam Stephenson 2013-02-08 15:29:23 -06:00
commit fdfe71c061
5 changed files with 16 additions and 3 deletions

View file

@ -1,5 +1,11 @@
## Version History ## Version History
#### 20130208
* Added a definition for 2.0.0-rc2
#### 20130206
* Added a definition for 1.9.3-p385
#### 20130129 #### 20130129
* Changed `rbenv install` to attempt to install the local app-specific * Changed `rbenv install` to attempt to install the local app-specific
version when it is invoked without any arguments. version when it is invoked without any arguments.

View file

@ -65,7 +65,7 @@ Or, if you would like to install the latest development release:
To install a Ruby version for use with rbenv, run `rbenv install` with To install a Ruby version for use with rbenv, run `rbenv install` with
the exact name of the version you want to install. For example, the exact name of the version you want to install. For example,
rbenv install 1.9.3-p374 rbenv install 1.9.3-p385
Ruby versions will be installed into a directory of the same name Ruby versions will be installed into a directory of the same name
under `~/.rbenv/versions`. under `~/.rbenv/versions`.
@ -84,7 +84,7 @@ Run the `ruby-build` command with the exact name of the version you
want to install and the full path where you want to install it. For want to install and the full path where you want to install it. For
example, example,
ruby-build 1.9.3-p374 ~/local/ruby-1.9.3-p374 ruby-build 1.9.3-p385 ~/local/ruby-1.9.3-p385
To see a list of all available Ruby versions, run `ruby-build To see a list of all available Ruby versions, run `ruby-build
--definitions`. --definitions`.

View file

@ -1,6 +1,6 @@
#!/usr/bin/env bash #!/usr/bin/env bash
RUBY_BUILD_VERSION="20130129" RUBY_BUILD_VERSION="20130206"
set -E set -E
exec 3<&2 # preserve original stderr at fd 3 exec 3<&2 # preserve original stderr at fd 3

View file

@ -0,0 +1,2 @@
install_package "yaml-0.1.4" "http://pyyaml.org/download/libyaml/yaml-0.1.4.tar.gz#36c852831d02cf90508c29852361d01b"
install_package "ruby-1.9.3-p385" "http://ftp.ruby-lang.org/pub/ruby/1.9/ruby-1.9.3-p385.tar.gz#3e0d7f8512400c1a6732327728a56f1d"

View file

@ -0,0 +1,5 @@
if has_broken_mac_openssl; then
install_package "openssl-1.0.1c" "https://www.openssl.org/source/openssl-1.0.1c.tar.gz#ae412727c8c15b67880aef7bd2999b2e" mac_openssl
fi
install_package "ruby-2.0.0-rc2" "http://ftp.ruby-lang.org/pub/ruby/2.0/ruby-2.0.0-rc2.tar.gz#9d5e6f26db7c8c3ddefc81fdb19bd41a" standard verify_openssl