Commits
Darrell Schiebel authored 36dd5a3a097 Merge
28 28 | @java_version = ( ); |
29 29 | open( , "$java -version 2>&1 |"); |
30 30 | foreach ( <> ) { |
31 31 | if ( | "?(\d+)\.(\d+)|i ) { |
32 32 | @java_version = ($1,$2); |
33 33 | print " ", join('.',@java_version), "\"; |
34 34 | } |
35 35 | } |
36 36 | close(JAVAVER); |
37 37 | die " $java" unless scalar(@java_version) > 0; |
38 - | die " 1.8 or \" unless $java_version[0] == 1 && $java_version[1] >= 8; |
38 + | die " 1.8 or \" unless $java_version[0] > 7 || ($java_version[0] == 1 && $java_version[1] >= 8); |
39 39 | |
40 40 | ### install path |
41 41 | $distro_jarfile = $jarfile = "$path//$jarfile_name"; |
42 42 | if ( ! -e $jarfile ) { |
43 43 | ### development path |
44 44 | $jarfile = "$path/..//-2.12/$jarfile_name"; |
45 45 | if ( ! -e $jarfile ) { |
46 46 | $jarfile = $distro_jarfile; |
47 47 | ### pull from download url |
48 48 | my $jardir = dirname($jarfile); |