actions/setup-node
2
0
Fork 0
mirror of https://gitea.com/actions/setup-node.git synced 2025-10-29 15:52:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

dbg

Browse Source
This commit is contained in:
Bryan MacFarlane
2020-05-03 18:37:13 -04:00
parent 8e221092f3
commit 5e7b076d00
2 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
dist/index.js vendored
View File

@@ -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, [

8
src/installer.ts
View File

@@ -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, [