Skip to content

Commit 3edeb3a

Browse files
Eskibearfbricon
authored andcommitted
fix checkJavaVersion for Windows
Signed-off-by: Yan Zhang <yanzh@microsoft.com>
1 parent 09d3ea3 commit 3edeb3a

1 file changed

Lines changed: 3 additions & 1 deletion

File tree

src/requirements.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import { checkJavaPreferences } from './settings';
1111

1212
const isWindows = process.platform.indexOf('win') === 0;
1313
const JAVAC_FILENAME = 'javac' + (isWindows ? '.exe' : '');
14+
const JAVA_FILENAME = 'java' + (isWindows ? '.exe' : '');
1415

1516
export interface RequirementsData {
1617
java_home: string;
@@ -80,7 +81,8 @@ function checkJavaRuntime(context: ExtensionContext): Promise<string> {
8081

8182
function checkJavaVersion(javaHome: string): Promise<number> {
8283
return new Promise((resolve, reject) => {
83-
cp.execFile(javaHome + '/bin/java', ['-version'], {}, (error, stdout, stderr) => {
84+
const javaBin = path.join(javaHome, "bin", JAVA_FILENAME);
85+
cp.execFile(javaBin, ['-version'], {}, (error, stdout, stderr) => {
8486
const javaVersion = parseMajorVersion(stderr);
8587
if (javaVersion < 8) {
8688
openJDKDownload(reject, 'Java 8 or more recent is required to run. Please download and install a recent JDK');

0 commit comments

Comments
 (0)