This commit is contained in:
Bryan MacFarlane 2020-05-03 16:34:20 -04:00
parent 42746a4f3c
commit a4145577de
2 changed files with 12 additions and 4 deletions

5
dist/index.js vendored
View File

@ -13015,11 +13015,12 @@ function getNode(versionSpec, stable, token) {
let extPath; let extPath;
if (osPlat == 'win32') { if (osPlat == 'win32') {
let _7zPath = path.join(__dirname, '..', 'externals', '7zr.exe'); let _7zPath = path.join(__dirname, '..', 'externals', '7zr.exe');
console.log(`downloadPath: ${downloadPath}`); console.log(`downloadPath: ${downloadPath}`, `isFile: ${fs.statSync(downloadPath).isFile()}`);
console.log(JSON.stringify(fs.statSync(downloadPath))); console.log(JSON.stringify(fs.statSync(downloadPath)));
extPath = yield tc.extract7z(downloadPath, undefined, _7zPath); extPath = yield tc.extract7z(downloadPath, undefined, _7zPath);
// 7z extracts to folder matching file name // 7z extracts to folder matching file name
extPath = path.join(extPath, path.basename(downloadPath)); extPath = path.join(extPath, path.basename(info.fileName, '.7z'));
console.log(`extPath: ${extPath}`, `isDirectory: ${fs.statSync(extPath).isDirectory()}`);
} }
else { else {
extPath = yield tc.extractTar(downloadPath, undefined, [ extPath = yield tc.extractTar(downloadPath, undefined, [

View File

@ -77,12 +77,19 @@ export async function getNode(
if (osPlat == 'win32') { if (osPlat == 'win32') {
let _7zPath = path.join(__dirname, '..', 'externals', '7zr.exe'); let _7zPath = path.join(__dirname, '..', 'externals', '7zr.exe');
console.log(`downloadPath: ${downloadPath}`); console.log(
`downloadPath: ${downloadPath}`,
`isFile: ${fs.statSync(downloadPath).isFile()}`
);
console.log(JSON.stringify(fs.statSync(downloadPath))); console.log(JSON.stringify(fs.statSync(downloadPath)));
extPath = await tc.extract7z(downloadPath, undefined, _7zPath); extPath = await tc.extract7z(downloadPath, undefined, _7zPath);
// 7z extracts to folder matching file name // 7z extracts to folder matching file name
extPath = path.join(extPath, path.basename(downloadPath)); extPath = path.join(extPath, path.basename(info.fileName, '.7z'));
console.log(
`extPath: ${extPath}`,
`isDirectory: ${fs.statSync(extPath).isDirectory()}`
);
} else { } else {
extPath = await tc.extractTar(downloadPath, undefined, [ extPath = await tc.extractTar(downloadPath, undefined, [
'xz', 'xz',