Skip to content

Add "Contents/Home" postfix on macOS if provider creates it #139

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
maxim-lobanov merged 9 commits into from
Mar 22, 2021
Merged

Add "Contents/Home" postfix on macOS if provider creates it #139

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
07c5d15
Update e2e-versions.yml
Mar 19, 2021
2af39a7
Update e2e-versions.yml
Mar 19, 2021
b082205
implement fix
Mar 19, 2021
57c14a4
Update e2e-versions.yml
Mar 19, 2021
b549019
Update installer.ts
Mar 19, 2021
4d83f46
fix filter logic
Mar 19, 2021
005617c
Update e2e-versions.yml
Mar 19, 2021
3ad3058
remove extra logic
Mar 19, 2021
7b948b5
Update e2e-versions.yml
Mar 19, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix filter logic
  • Loading branch information
Maxim Lobanov
Maxim Lobanov committed Mar 19, 2021
commit 4d83f46b4cdd7aa945461ef40ff9f98b21dc9a09
9 changes: 6 additions & 3 deletions dist/setup/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14083,11 +14083,14 @@ class ZuluDistribution extends base_installer_1.JavaBase {
return mainVersion;
}
findJDKInstallationSubfolder(archiveFolder) {
// Zulu archive contains a bunch of symlinks and zulu-<major_version>.jdk subfolder
if (process.platform != 'darwin') {
return archiveFolder;
}
// Zulu archive on macOS contains a set of symlinks and zulu-<major_version>.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;
}
Expand Down
2 changes: 1 addition & 1 deletion src/distributions/zulu/installer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ export class ZuluDistribution extends JavaBase {
// Zulu archive on macOS contains a set of symlinks and zulu-<major_version>.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;
Expand Down