actions/setup-java
1
0
Fork 0
mirror of https://github.com/actions/setup-java.git synced 2025-04-08 05:37:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

Read correct directory

Browse Source
This commit is contained in:
Danny McCormick 2019-07-10 15:24:02 -04:00
parent 69118bc9c6
commit e07476fbe4
2 changed files with 2 additions and 2 deletions

2
lib/installer.js

@ -131,7 +131,7 @@ function unzipJavaDownload(repoRoot, fileEnding, destinationFolder) {
const stats = fs.statSync(jdkFile); const stats = fs.statSync(jdkFile);
if (stats.isFile()) { if (stats.isFile()) {
yield extractFiles(jdkFile, fileEnding, destinationFolder); yield extractFiles(jdkFile, fileEnding, destinationFolder);
const jdkDirectory = fs.readdirSync(tempDirectory)[0]; const jdkDirectory = fs.readdirSync(destinationFolder)[0];
yield unpackJars(jdkDirectory, path.join(jdkDirectory, 'bin')); yield unpackJars(jdkDirectory, path.join(jdkDirectory, 'bin'));
return jdkDirectory; return jdkDirectory;
} }

2
src/installer.ts

@ -128,7 +128,7 @@ async function unzipJavaDownload(
const stats = fs.statSync(jdkFile); const stats = fs.statSync(jdkFile);
if (stats.isFile()) { if (stats.isFile()) {
await extractFiles(jdkFile, fileEnding, destinationFolder); await extractFiles(jdkFile, fileEnding, destinationFolder);
const jdkDirectory = fs.readdirSync(tempDirectory)[0]; const jdkDirectory = fs.readdirSync(destinationFolder)[0];
await unpackJars(jdkDirectory, path.join(jdkDirectory, 'bin')); await unpackJars(jdkDirectory, path.join(jdkDirectory, 'bin'));
return jdkDirectory; return jdkDirectory;
} else { } else {