From b5490195d131c36e8c4b78883009cdd56f0c01ef Mon Sep 17 00:00:00 2001 From: Maxim Lobanov Date: Fri, 19 Mar 2021 12:05:53 +0300 Subject: [PATCH] Update installer.ts --- src/distributions/zulu/installer.ts | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/distributions/zulu/installer.ts b/src/distributions/zulu/installer.ts index 42e2b2db..d5e5dc84 100644 --- a/src/distributions/zulu/installer.ts +++ b/src/distributions/zulu/installer.ts @@ -164,11 +164,15 @@ export class ZuluDistribution extends JavaBase { } private findJDKInstallationSubfolder(archiveFolder: string) { - // Zulu archive contains a bunch of symlinks and zulu-.jdk subfolder + if (process.platform != 'darwin') { + return archiveFolder; + } + + // Zulu archive on macOS contains a set of symlinks and zulu-.jdk subfolder const jdkFolders = fs .readdirSync(archiveFolder, { withFileTypes: true }) - .filter(item => !item.isSymbolicLink()) - .filter(item => item.name.startsWith('zulu-') && item.name.endsWith('.jdk')); + .filter(item => item.isDirectory() && !item.isSymbolicLink() ) + .filter(item => /^zulu-\d+\.\w+$/.test(item.name)); if (jdkFolders.length === 0) { return archiveFolder; }