mirrors/rbenv-ruby-build
1
0
Fork 0
mirror of https://github.com/rbenv/ruby-build.git synced 2025-09-10 11:11:12 +02:00
Code Issues Projects Releases Packages Wiki Activity

Fix requiring Java 8 for JRuby 9.2

Browse source 
Ref. #1372, fix #1373, fix #1246
This commit is contained in:
Mislav Marohnić 2019-11-02 11:33:08 +01:00
parent b4e504c858
commit 9d78f06d1d
13 changed files with 22 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
bin/ruby-build
View file

@ -798,15 +798,21 @@ fix_rbx_irb() {
true true
} }
require_java7() { require_java() {
local version="$(java -version 2>&1 | grep '\(java\|openjdk\) version' | head -1)" local required="$1"
if [[ $version != *[789]* ]]; then local version="$(java -version 2>&1 | grep '\(java\|openjdk\) version' | head -1 | grep -o '1\.[0-9]\+')"
if [ -z "$version" ] || [ "${version##*.}" -lt "$required" ]; then
colorize 1 "ERROR" >&3 colorize 1 "ERROR" >&3
echo ": Java 7 required. Please install a 1.7-compatible JRE." >&3 echo ": Java ${required} required. Please install a 1.${required}-compatible JRE." >&3
return 1 return 1
fi fi
} }
# keep for backwards compatibility
require_java7() {
require_java 7
}
require_gcc() { require_gcc() {
local gcc="$(locate_gcc || true)" local gcc="$(locate_gcc || true)"