From 3f8bc57cc693de4082bc05635017e47a9683be35 Mon Sep 17 00:00:00 2001 From: Martin Zeithaml <66114686+Martin-Zeithaml@users.noreply.github.com> Date: Wed, 29 Jan 2025 14:11:32 +0100 Subject: [PATCH] `validateJavaHome` returns better text Signed-off-by: Martin Zeithaml <66114686+Martin-Zeithaml@users.noreply.github.com> --- bin/libs/java.ts | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/bin/libs/java.ts b/bin/libs/java.ts index df0ac33bf1..896d5a0c20 100644 --- a/bin/libs/java.ts +++ b/bin/libs/java.ts @@ -102,8 +102,9 @@ export function validateJavaHome(javaHome:string|undefined=std.getenv("JAVA_HOME let versionLines = (version as string).split('\n'); // valid because of above rc check for (let i = 0; i < versionLines.length; i++) { if ((index = versionLines[i].indexOf('java version')) != -1) { - //format of: java version "1.8.0_321" - javaVersionShort=versionLines[i].substring(index+('java version'.length)+2, versionLines[i].length-1); + //format of: java version "1.8.0_321" OR java version "17.0.10" 2024-01-02 + javaVersionShort = versionLines[i].substring(index+('java version'.length)+2); + javaVersionShort = javaVersionShort.replace(/"/g, ''); break; } else if ((index = versionLines[i].indexOf('openjdk version')) != -1) { javaVersionShort=versionLines[i].substring(index+('openjdk version'.length)+2, versionLines[i].length-1);