From 6bf5feba21f8f5532584fd9926a6ede22418bd06 Mon Sep 17 00:00:00 2001 From: deepak1556 Date: Tue, 30 Jul 2019 15:51:37 -0700 Subject: [PATCH] fix: account for new helper executables Electron Helper (Renderer) Electron Helper (Plugin) Electron Helper (Gpu) --- src/darwin.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/darwin.js b/src/darwin.js index ec9ef10..16de927 100644 --- a/src/darwin.js +++ b/src/darwin.js @@ -263,17 +263,17 @@ function renameAppHelper(opts) { var name = opts.productName; return rename(function (path) { - var basenameMatch = /^Electron Helper( \w+)?$/.exec(path.basename); + var basenameMatch = /^Electron Helper( \(\w+\))?$/.exec(path.basename); if (/Contents\/Frameworks/.test(path.dirname) && path.extname === '.app' && basenameMatch) { var suffix = basenameMatch[1] || ''; path.basename = name + ' Helper' + suffix; - } else if (/Contents\/Frameworks\/Electron\ Helper( \w+)?\.app/.test(path.dirname)) { - var isInMacOS = /Contents\/Frameworks\/Electron\ Helper( \w+)?\.app\/Contents\/MacOS$/.test(path.dirname); - path.dirname = path.dirname.replace(/Electron\ Helper( \w+)?\.app/, name + ' Helper$1.app'); + } else if (/Contents\/Frameworks\/Electron\ Helper( \(\w+\))?\.app/.test(path.dirname)) { + var isInMacOS = /Contents\/Frameworks\/Electron\ Helper( \(\w+\))?\.app\/Contents\/MacOS$/.test(path.dirname); + path.dirname = path.dirname.replace(/Electron\ Helper( \(\w+\))?\.app/, name + ' Helper$1.app'); - if (isInMacOS && /^Electron Helper( \w+)?$/.test(path.basename) && path.extname === '') { - path.basename = path.basename.replace(/Electron\ Helper( \w+)?$/, name + ' Helper$1'); + if (isInMacOS && /^Electron Helper( \(\w+\))?$/.test(path.basename) && path.extname === '') { + path.basename = path.basename.replace(/Electron\ Helper( \(\w+\))?$/, name + ' Helper$1'); } } });