diff --git a/ui/desktop/electron-app/src/cli/path.js b/ui/desktop/electron-app/src/cli/path.js index 1bb7aef86..bab10bf08 100644 --- a/ui/desktop/electron-app/src/cli/path.js +++ b/ui/desktop/electron-app/src/cli/path.js @@ -6,5 +6,5 @@ module.exports = { path: () => { const name = isWindows() ? 'boundary.exe' : 'boundary'; return path.resolve(__dirname, '..', '..', 'cli', name); - } + }, }; diff --git a/ui/desktop/electron-app/src/config/menu.js b/ui/desktop/electron-app/src/config/menu.js index 6813ebc94..67a2d5449 100644 --- a/ui/desktop/electron-app/src/config/menu.js +++ b/ui/desktop/electron-app/src/config/menu.js @@ -11,39 +11,42 @@ const generateMenuTemplate = () => { const cliVersion = version().formatted; const copyright = config.copyright; - const dialogOpts = { + dialog.showMessageBox({ type: 'none', message: config.productName, detail: `${appVersion}\n${appCommit}\n\n${cliVersion}\n\n${copyright}`, - }; - dialog.showMessageBox(dialogOpts); - } + }); + }; return [ // { role: 'appMenu' } - ...(isMac() ? [{ - label: 'Boundary', - submenu: [ - // { role: 'about' }, - { - label: `About ${config.productName}`, - click: aboutDialog, - }, - { - id: 'update', - label: 'Check for Updates', - click: async () => appUpdater.run(), - }, - { type: 'separator' }, - { role: 'services' }, - { type: 'separator' }, - { role: 'hide' }, - { role: 'hideothers' }, - { role: 'unhide' }, - { type: 'separator' }, - { role: 'quit' }, - ], - }] : []), + ...(isMac() + ? [ + { + label: 'Boundary', + submenu: [ + // { role: 'about' }, + { + label: `About ${config.productName}`, + click: aboutDialog, + }, + { + id: 'update', + label: 'Check for Updates', + click: async () => appUpdater.run(), + }, + { type: 'separator' }, + { role: 'services' }, + { type: 'separator' }, + { role: 'hide' }, + { role: 'hideothers' }, + { role: 'unhide' }, + { type: 'separator' }, + { role: 'quit' }, + ], + }, + ] + : []), // { role: 'fileMenu' } { label: 'File', @@ -59,23 +62,18 @@ const generateMenuTemplate = () => { { role: 'cut' }, { role: 'copy' }, { role: 'paste' }, - ...(isMac() ? [ - { role: 'pasteAndMatchStyle' }, - { role: 'delete' }, - { role: 'selectAll' }, - { type: 'separator' }, - { - label: 'Speech', - submenu: [ - { role: 'startspeaking' }, - { role: 'stopspeaking' } + ...(isMac() + ? [ + { role: 'pasteAndMatchStyle' }, + { role: 'delete' }, + { role: 'selectAll' }, + { type: 'separator' }, + { + label: 'Speech', + submenu: [{ role: 'startspeaking' }, { role: 'stopspeaking' }], + }, ] - } - ] : [ - { role: 'delete' }, - { type: 'separator' }, - { role: 'selectAll' } - ]), + : [{ role: 'delete' }, { type: 'separator' }, { role: 'selectAll' }]), ], }, // { role: 'viewMenu' } @@ -98,14 +96,14 @@ const generateMenuTemplate = () => { submenu: [ { role: 'minimize' }, { role: 'zoom' }, - ...(isMac() ? [ - { type: 'separator' }, - { role: 'front' }, - { type: 'separator' }, - { role: 'window' } - ] : [ - { role: 'close' } - ]) + ...(isMac() + ? [ + { type: 'separator' }, + { role: 'front' }, + { type: 'separator' }, + { role: 'window' }, + ] + : [{ role: 'close' }]), ], }, { @@ -115,13 +113,15 @@ const generateMenuTemplate = () => { label: 'Documentation', click: () => shell.openExternal('https://www.boundaryproject.io'), }, - ...(isWindows() ? [ - // { role: 'about' }, - { - label: `About ${config.productName}`, - click: aboutDialog, - }, - ] : []) + ...(isWindows() + ? [ + // { role: 'about' }, + { + label: `About ${config.productName}`, + click: aboutDialog, + }, + ] + : []), ], }, ]; diff --git a/ui/desktop/electron-app/src/helpers/spawn-promise.js b/ui/desktop/electron-app/src/helpers/spawn-promise.js index 1ad034fa7..c1dd3d699 100644 --- a/ui/desktop/electron-app/src/helpers/spawn-promise.js +++ b/ui/desktop/electron-app/src/helpers/spawn-promise.js @@ -67,7 +67,7 @@ module.exports = { * @return {string} */ spawnSync(command) { - const childProcess = spawnSync(path(), command, { shell: isWindows() }); + const childProcess = spawnSync(path(), command); const rawOutput = childProcess.output.toString(); return rawOutput; },