Skip to content
Snippets Groups Projects
Unverified Commit 54561374 authored by trop[bot]'s avatar trop[bot] Committed by GitHub
Browse files

chore: fix dangling promise in npm install (#36400)


* Fix dangling promise introduced in #33979

Co-authored-by: default avatarhyrious <hyrious@outlook.com>

* fix reject in callback

Co-authored-by: default avatarhyrious <hyrious@outlook.com>

* simplify code

Co-authored-by: default avatarBlack-Hole <158blackhole@gmail.com>

Co-authored-by: default avatarhyrious <hyrious@outlook.com>

Co-authored-by: default avatartrop[bot] <37223003+trop[bot]@users.noreply.github.com>
Co-authored-by: default avatarhyrious <hyrious@outlook.com>
parent 9945746f
No related merge requests found
......@@ -70,29 +70,21 @@ function isInstalled () {
// unzips and makes path.txt point at the correct executable
function extractFile (zipPath) {
return new Promise((resolve, reject) => {
const distPath = process.env.ELECTRON_OVERRIDE_DIST_PATH || path.join(__dirname, 'dist');
extract(zipPath, { dir: path.join(__dirname, 'dist') })
.then(() => {
// If the zip contains an "electron.d.ts" file,
// move that up
const srcTypeDefPath = path.join(distPath, 'electron.d.ts');
const targetTypeDefPath = path.join(__dirname, 'electron.d.ts');
const hasTypeDefinitions = fs.existsSync(srcTypeDefPath);
if (hasTypeDefinitions) {
try {
fs.renameSync(srcTypeDefPath, targetTypeDefPath);
} catch (err) {
reject(err);
}
}
// Write a "path.txt" file.
return fs.promises.writeFile(path.join(__dirname, 'path.txt'), platformPath);
})
.catch((err) => reject(err));
const distPath = process.env.ELECTRON_OVERRIDE_DIST_PATH || path.join(__dirname, 'dist');
return extract(zipPath, { dir: path.join(__dirname, 'dist') }).then(() => {
// If the zip contains an "electron.d.ts" file,
// move that up
const srcTypeDefPath = path.join(distPath, 'electron.d.ts');
const targetTypeDefPath = path.join(__dirname, 'electron.d.ts');
const hasTypeDefinitions = fs.existsSync(srcTypeDefPath);
if (hasTypeDefinitions) {
fs.renameSync(srcTypeDefPath, targetTypeDefPath);
}
// Write a "path.txt" file.
return fs.promises.writeFile(path.join(__dirname, 'path.txt'), platformPath);
});
}
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment