Skip to content

R
ruby-build
Commit 060f50fc by Colin Mattson
Options

Improve Java 7 detection 

Java on most (all?) platforms directs `-version` output to STDERR.
parent 229bf9b0
Showing with 3 additions and 3 deletions
bin/ruby-build
...@@ -583,7 +583,7 @@ fix_rbx_irb() { ...@@ -583,7 +583,7 @@ fix_rbx_irb() {
} }
require_java7() { require_java7() {
local version="$(java -version 2>/dev/null | head -1)" local version="$(java -version 2>&1 | head -1)"
if [[ $version != *1.[789]* ]]; then if [[ $version != *1.[789]* ]]; then
colorize 1 "ERROR" >&3 colorize 1 "ERROR" >&3
echo ": Java 7 required. Please install a 1.7-compatible JRE." >&3 echo ": Java 7 required. Please install a 1.7-compatible JRE." >&3
......
test/build.bats
...@@ -438,7 +438,7 @@ OUT ...@@ -438,7 +438,7 @@ OUT
@test "JRuby Java is outdated" { @test "JRuby Java is outdated" {
cached_tarball "jruby-9000.dev" bin/jruby cached_tarball "jruby-9000.dev" bin/jruby
stub java '-version : echo java version "1.6.0_21"' stub java '-version : echo java version "1.6.0_21" >&2'
run_inline_definition <<DEF run_inline_definition <<DEF
require_java7 require_java7
...@@ -452,7 +452,7 @@ OUT ...@@ -452,7 +452,7 @@ OUT
@test "JRuby Java 7 up-to-date" { @test "JRuby Java 7 up-to-date" {
cached_tarball "jruby-9000.dev" bin/jruby cached_tarball "jruby-9000.dev" bin/jruby
stub java '-version : echo java version "1.7.0_21"' stub java '-version : echo java version "1.7.0_21" >&2'
run_inline_definition <<DEF run_inline_definition <<DEF
require_java7 require_java7
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment