dbg
This commit is contained in:
parent
8e221092f3
commit
5e7b076d00
2 changed files with 12 additions and 5 deletions
9
dist/index.js
vendored
9
dist/index.js
vendored
|
@ -13013,15 +13013,22 @@ function getNode(versionSpec, stable, token) {
|
||||||
//
|
//
|
||||||
// Extract
|
// Extract
|
||||||
//
|
//
|
||||||
|
console.log(`Extracting ${downloadPath}`);
|
||||||
|
if (!fs.existsSync(downloadPath)) {
|
||||||
|
console.log('File not downloaded correctly');
|
||||||
|
}
|
||||||
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');
|
||||||
extPath = yield tc.extract7z(downloadPath, undefined, _7zPath);
|
extPath = yield tc.extract7z(downloadPath, undefined, _7zPath);
|
||||||
|
console.log(`contents of ${extPath}`);
|
||||||
|
console.log(extPath);
|
||||||
// 7z extracts to folder matching file name
|
// 7z extracts to folder matching file name
|
||||||
let nestedPath = path.join(extPath, path.basename(info.fileName, '.7z'));
|
let nestedPath = path.join(extPath, path.basename(info.fileName, '.7z'));
|
||||||
if (fs.statSync(nestedPath) && fs.statSync(nestedPath).isDirectory()) {
|
if (fs.existsSync(nestedPath)) {
|
||||||
extPath = nestedPath;
|
extPath = nestedPath;
|
||||||
}
|
}
|
||||||
|
console.log(`using ${extPath}`);
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
extPath = yield tc.extractTar(downloadPath, undefined, [
|
extPath = yield tc.extractTar(downloadPath, undefined, [
|
||||||
|
|
|
@ -74,11 +74,11 @@ export async function getNode(
|
||||||
//
|
//
|
||||||
// Extract
|
// Extract
|
||||||
//
|
//
|
||||||
console.log(`Extracting ${downloadPath}`)
|
console.log(`Extracting ${downloadPath}`);
|
||||||
if (!fs.existsSync(downloadPath)) {
|
if (!fs.existsSync(downloadPath)) {
|
||||||
throw new Error('File not downloaded correctly');
|
console.log('File not downloaded correctly');
|
||||||
}
|
}
|
||||||
|
|
||||||
let extPath: string;
|
let extPath: string;
|
||||||
if (osPlat == 'win32') {
|
if (osPlat == 'win32') {
|
||||||
let _7zPath = path.join(__dirname, '..', 'externals', '7zr.exe');
|
let _7zPath = path.join(__dirname, '..', 'externals', '7zr.exe');
|
||||||
|
@ -90,7 +90,7 @@ export async function getNode(
|
||||||
if (fs.existsSync(nestedPath)) {
|
if (fs.existsSync(nestedPath)) {
|
||||||
extPath = nestedPath;
|
extPath = nestedPath;
|
||||||
}
|
}
|
||||||
|
|
||||||
console.log(`using ${extPath}`);
|
console.log(`using ${extPath}`);
|
||||||
} else {
|
} else {
|
||||||
extPath = await tc.extractTar(downloadPath, undefined, [
|
extPath = await tc.extractTar(downloadPath, undefined, [
|
||||||
|
|
Loading…
Reference in a new issue