Partial fix for #595 - Add explicit check for java binary

robstryker · robstryker · commit bb3d7f35619b · 2024-04-01T15:49:42.000-04:00
Signed-off-by: Rob Stryker &lt;rob@oxbeef.net&gt;
diff --git a/src/impl/requirements.ts b/src/impl/requirements.ts
@@ -101,6 +101,9 @@ async function checkJavaRuntime(): Promise<string | RspRequirementsRejection> {
         if (!pathExists.sync(javaHome)) {
             return getRejectionWithDownloadUrl(`${source} points to a missing folder`);
         }
+        if (!pathExists.sync(path.resolve(javaHome, 'bin', JAVA_FILENAME))) {
+            return getRejectionWithDownloadUrl(`${source} does not point to a JDK. The '${JAVA_FILENAME}' command is missing.`);
+        }
         if (!pathExists.sync(path.resolve(javaHome, 'bin', JAVAC_FILENAME))) {
             return getRejectionWithDownloadUrl(`${source} does not point to a JDK. The '${JAVAC_FILENAME}' command is missing.`);
         }

Original file line number	Diff line number	Diff line change
`@@ -101,6 +101,9 @@ async function checkJavaRuntime(): Promise<string \| RspRequirementsRejection> {`
`101`	`101`	`if (!pathExists.sync(javaHome)) {`
`102`	`102`	return getRejectionWithDownloadUrl(`${source} points to a missing folder`);
`103`	`103`	`}`
	`104`	`+ if (!pathExists.sync(path.resolve(javaHome, 'bin', JAVA_FILENAME))) {`
	`105`	+ return getRejectionWithDownloadUrl(`${source} does not point to a JDK. The '${JAVA_FILENAME}' command is missing.`);
	`106`	`+ }`
`104`	`107`	`if (!pathExists.sync(path.resolve(javaHome, 'bin', JAVAC_FILENAME))) {`
`105`	`108`	return getRejectionWithDownloadUrl(`${source} does not point to a JDK. The '${JAVAC_FILENAME}' command is missing.`);
`106`	`109`	`}`