diff --git a/dist/setup/index.js b/dist/setup/index.js index 288db359..5b86ad15 100644 --- a/dist/setup/index.js +++ b/dist/setup/index.js @@ -14083,11 +14083,14 @@ class ZuluDistribution extends base_installer_1.JavaBase { return mainVersion; } findJDKInstallationSubfolder(archiveFolder) { - // 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_1.default .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; } diff --git a/src/distributions/zulu/installer.ts b/src/distributions/zulu/installer.ts index d5e5dc84..87284927 100644 --- a/src/distributions/zulu/installer.ts +++ b/src/distributions/zulu/installer.ts @@ -171,7 +171,7 @@ export class ZuluDistribution extends JavaBase { // Zulu archive on macOS contains a set of symlinks and zulu-.jdk subfolder const jdkFolders = fs .readdirSync(archiveFolder, { withFileTypes: true }) - .filter(item => item.isDirectory() && !item.isSymbolicLink() ) + .filter(item => item.isDirectory() && !item.isSymbolicLink()) .filter(item => /^zulu-\d+\.\w+$/.test(item.name)); if (jdkFolders.length === 0) { return archiveFolder;