From bb04f2214fe698d53df10ee80f72e3795be9228c Mon Sep 17 00:00:00 2001 From: "trop[bot]" <37223003+trop[bot]@users.noreply.github.com> Date: Fri, 18 Nov 2022 23:22:30 +0000 Subject: [PATCH] Fix dangling promise introduced in #33979 Co-authored-by: hyrious --- npm/install.js | 42 +++++++++++++++++++----------------------- 1 file changed, 19 insertions(+), 23 deletions(-) diff --git a/npm/install.js b/npm/install.js index 864ca633fd30f..a373670937f9e 100755 --- a/npm/install.js +++ b/npm/install.js @@ -70,29 +70,25 @@ 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) { + try { + fs.renameSync(srcTypeDefPath, targetTypeDefPath); + } catch (err) { + reject(err); + } + } + + // Write a "path.txt" file. + return fs.promises.writeFile(path.join(__dirname, 'path.txt'), platformPath); }); }