Use $JAVA_HOME/bin/java for the check

2026-09-13 14:34:21 +02:00 · 2025-03-15 12:36:12 +01:00
2 changed files with 6 additions and 2 deletions
@@ -409,7 +409,9 @@ export async function setupJavaHome(rubyPrefix) {
  await measure("Modifying JAVA_HOME for JRuby", async () => {
    console.log("attempting to run with existing JAVA_HOME")

-    let ret = await exec.exec('java', ['-jar', path.join(rubyPrefix, 'lib/jruby.jar'), '--version'], {ignoreReturnCode: true})
+    const javaHome = process.env['JAVA_HOME']
+    let java = javaHome ? path.join(javaHome, 'bin/java') : 'java'
+    let ret = await exec.exec(java, ['-jar', path.join(rubyPrefix, 'lib/jruby.jar'), '--version'], {ignoreReturnCode: true})

    if (ret === 0) {
      console.log("JRuby successfully starts, using existing JAVA_HOME")
@@ -729,7 +729,9 @@ async function setupJavaHome(rubyPrefix) {
  await measure("Modifying JAVA_HOME for JRuby", async () => {
    console.log("attempting to run with existing JAVA_HOME")

-    let ret = await exec.exec('java', ['-jar', path.join(rubyPrefix, 'lib/jruby.jar'), '--version'], {ignoreReturnCode: true})
+    const javaHome = process.env['JAVA_HOME']
+    let java = javaHome ? path.join(javaHome, 'bin/java') : 'java'
+    let ret = await exec.exec(java, ['-jar', path.join(rubyPrefix, 'lib/jruby.jar'), '--version'], {ignoreReturnCode: true})

    if (ret === 0) {
      console.log("JRuby successfully starts, using existing JAVA_HOME")