More robust method to check for JDK

2022-01-17 14:44:05 -05:00
parent a742fc9f48
commit d71b70b39b
3 changed files with 252 additions and 4 deletions
--- a/nodejs-packages/jvm-launch-utils/src/jvm-util.ts
+++ b/nodejs-packages/jvm-launch-utils/src/jvm-util.ts
@@ -181,7 +181,9 @@ class JVMImpl implements JVM {
        return this.javaExe;
    }
    isJdk(): boolean {
-        return FS.existsSync(Path.resolve(this.getJavaHome(), "jmods", "jdk.management.jmod"));
+        const javaExecutable = this.getJavaExecutable();
+        const str = ChildProcess.execSync(javaExecutable + ' --list-modules', {windowsHide: true, encoding: 'utf8'});
+        return str.search(/^jdk.management@.*$/m) >= 0;
    }
    jarLaunch(jar: string, vmargs?: [string], execFileOptions?: ChildProcess.ExecFileOptions): ChildProcess.ChildProcess {
        let args = [];