use zip and unzip from path (#161)

This commit is contained in:
Bryan MacFarlane authored and GitHub committed 2019-09-24 17:07:08 -04:00
1 parent 73e29cfaa1
commit db534fd20b
7 files changed
+5 -24

No files matched your search

BIN
View File
Binary file not shown.
BIN
View File
Binary file not shown.
+2 -6
View File
@@ -287,9 +287,7 @@ describe('@actions/tool-cache', function() {
] ]
await exec.exec(`"${powershellPath}"`, args) await exec.exec(`"${powershellPath}"`, args)
} else { } else {
const zipBin: string = const zipPath: string = await io.which('zip')
process.platform === 'darwin' ? 'zip-darwin' : 'zip'
const zipPath: string = path.join(__dirname, 'externals', zipBin)
await exec.exec(`"${zipPath}`, [zipFile, '-r', '.'], {cwd: stagingDir}) await exec.exec(`"${zipPath}`, [zipFile, '-r', '.'], {cwd: stagingDir})
} }
@@ -340,9 +338,7 @@ describe('@actions/tool-cache', function() {
] ]
await exec.exec(`"${powershellPath}"`, args) await exec.exec(`"${powershellPath}"`, args)
} else { } else {
const zipBin: string = const zipPath: string = await io.which('zip')
process.platform === 'darwin' ? 'zip-darwin' : 'zip'
const zipPath = path.join(__dirname, 'externals', zipBin)
await exec.exec(zipPath, [zipFile, '-r', '.'], {cwd: stagingDir}) await exec.exec(zipPath, [zipFile, '-r', '.'], {cwd: stagingDir})
} }
+1 -1
View File
@@ -1,6 +1,6 @@
{ {
"name": "@actions/tool-cache", "name": "@actions/tool-cache",
"version": "1.1.0", "version": "1.1.1",
"lockfileVersion": 1, "lockfileVersion": 1,
"requires": true, "requires": true,
"dependencies": { "dependencies": {
BIN
View File
Binary file not shown.
BIN
View File
Binary file not shown.
+2 -17
View File
@@ -223,11 +223,7 @@ export async function extractZip(file: string, dest?: string): Promise<string> {
if (IS_WINDOWS) { if (IS_WINDOWS) {
await extractZipWin(file, dest) await extractZipWin(file, dest)
} else { } else {
if (process.platform === 'darwin') { await extractZipNix(file, dest)
await extractZipDarwin(file, dest)
} else {
await extractZipNix(file, dest)
}
} }
return dest return dest
@@ -255,18 +251,7 @@ async function extractZipWin(file: string, dest: string): Promise<void> {
} }
async function extractZipNix(file: string, dest: string): Promise<void> { async function extractZipNix(file: string, dest: string): Promise<void> {
const unzipPath = path.join(__dirname, '..', 'scripts', 'externals', 'unzip') const unzipPath = await io.which('unzip')
await exec(`"${unzipPath}"`, [file], {cwd: dest})
}
async function extractZipDarwin(file: string, dest: string): Promise<void> {
const unzipPath = path.join(
__dirname,
'..',
'scripts',
'externals',
'unzip-darwin'
)
await exec(`"${unzipPath}"`, [file], {cwd: dest}) await exec(`"${unzipPath}"`, [file], {cwd: dest})
} }