actions/setup-java
2
0
Fork 0
mirror of https://github.com/actions/setup-java.git synced 2025-04-20 01:46:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix for jdkDirectory on macos

Browse source
This commit is contained in:
Gerrit Grunwald 2021-03-19 09:30:43 +01:00
parent 1f94f70edd
commit 67a6c070ca
2 changed files with 37 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

21
dist/setup/index.js vendored
View file

@ -33650,7 +33650,7 @@ function unzipJavaDownload(repoRoot, fileEnding, destinationFolder, extension) {
const stats = fs.statSync(jdkFile);
if (stats.isFile()) {
yield extractFiles(jdkFile, fileEnding, destinationFolder);
const jdkDirectory = path.join(destinationFolder, fs.readdirSync(destinationFolder)[0]);
const jdkDirectory = getJdkDirectory(destinationFolder);
yield unpackJars(jdkDirectory, path.join(jdkDirectory, 'bin'));
return jdkDirectory;
}
@ -33725,7 +33725,9 @@ function getDownloadInfo(refs, version, arch, javaPackage, distro = 'zulu') {
url += '&architecture=' + architecture;
url += '&operating_system=' + operatingSystem;
url += '&archive_type=' + archiveType;
if (version.includes('x') || version.includes('ea') || version.startsWith('1.')) {
if (version.includes('x') ||
version.includes('ea') ||
version.startsWith('1.')) {
url += '&latest=overall';
}
const http = new httpm.HttpClient('bundles', undefined, {
@ -33790,6 +33792,21 @@ function getPackageFileUrl(ephemeralId) {
return '';
});
}
function getJdkDirectory(destinationFolder) {
const jdkRoot = path.join(destinationFolder, fs.readdirSync(destinationFolder)[0]);
if (process.platform === 'darwin') {
const binDirectory = path.join(jdkRoot, 'bin');
if (fs.existsSync(binDirectory)) {
return jdkRoot;
}
else {
return path.join(jdkRoot, 'Contents', 'Home');
}
}
else {
return jdkRoot;
}
}
/***/ }),

22
src/installer.ts
View file

@ -176,10 +176,7 @@ async function unzipJavaDownload(
const stats = fs.statSync(jdkFile);
if (stats.isFile()) {
await extractFiles(jdkFile, fileEnding, destinationFolder);
const jdkDirectory = path.join(
destinationFolder,
fs.readdirSync(destinationFolder)[0]
);
const jdkDirectory = getJdkDirectory(destinationFolder);
await unpackJars(jdkDirectory, path.join(jdkDirectory, 'bin'));
return jdkDirectory;
} else {
@ -328,3 +325,20 @@ async function getPackageFileUrl(ephemeralId: string) {
}
return '';
}
function getJdkDirectory(destinationFolder: string): string {
const jdkRoot: string = path.join(
destinationFolder,
fs.readdirSync(destinationFolder)[0]
);
if (process.platform === 'darwin') {
const binDirectory: string = path.join(jdkRoot, 'bin');
if (fs.existsSync(binDirectory)) {
return jdkRoot;
} else {
return path.join(jdkRoot, 'Contents', 'Home');
}
} else {
return jdkRoot;
}
}