Commit 49aaa894 authored by Erik Michaels-Ober's avatar Erik Michaels-Ober
Browse files

Merge pull request #511 from cmattson/java7-detection 

Fix Java 7 detection
parents 229bf9b0 060f50fc

bin/ruby-build

+1 −1
Original line number Diff line number Diff line
@@ -583,7 +583,7 @@ fix_rbx_irb() { 
}



require_java7() {

  local version="$(java -version 2>/dev/null | head -1)"

  local version="$(java -version 2>&1 | head -1)"

  if [[ $version != *1.[789]* ]]; then

    colorize 1 "ERROR" >&3

    echo ": Java 7 required. Please install a 1.7-compatible JRE." >&3

test/build.bats

+2 −2
Original line number Diff line number Diff line
@@ -438,7 +438,7 @@ OUT 
@test "JRuby Java is outdated" {

  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

require_java7
@@ -452,7 +452,7 @@ OUT 
@test "JRuby Java 7 up-to-date" {

  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

require_java7