diff --git a/src/browser/components/SettingsPage.jsx b/src/browser/components/SettingsPage.jsx index 33d555e1..4c519a26 100644 --- a/src/browser/components/SettingsPage.jsx +++ b/src/browser/components/SettingsPage.jsx @@ -9,13 +9,12 @@ const AutoLaunch = require('auto-launch'); const {debounce} = require('underscore'); const settings = require('../../common/settings'); -const appName = require('../../package.json').productName; const TeamList = require('./TeamList.jsx'); const AutoSaveIndicator = require('./AutoSaveIndicator.jsx'); const appLauncher = new AutoLaunch({ - name: appName, + name: remote.app.getName(), isHidden: true }); diff --git a/src/browser/settings.jsx b/src/browser/settings.jsx index dd88bc40..305a4a06 100644 --- a/src/browser/settings.jsx +++ b/src/browser/settings.jsx @@ -1,12 +1,10 @@ 'use strict'; -const appName = require('../package.json').productName; +const {remote} = require('electron'); window.eval = global.eval = () => { - throw new Error(`Sorry, ${appName} does not support window.eval() for security reasons.`); + throw new Error(`Sorry, ${remote.app.getName()} does not support window.eval() for security reasons.`); }; -const {remote} = require('electron'); - const React = require('react'); const ReactDOM = require('react-dom'); const SettingsPage = require('./components/SettingsPage.jsx'); diff --git a/src/main/squirrelStartup.js b/src/main/squirrelStartup.js index d2d9f196..5f738052 100644 --- a/src/main/squirrelStartup.js +++ b/src/main/squirrelStartup.js @@ -1,5 +1,5 @@ const AutoLaunch = require('auto-launch'); -const appName = require('../package.json').productName; +const {remote} = require('electron'); function shouldQuitApp(cmd) { if (process.platform !== 'win32') { @@ -10,7 +10,7 @@ function shouldQuitApp(cmd) { async function setupAutoLaunch(cmd) { const appLauncher = new AutoLaunch({ - name: appName, + name: remote.app.getName(), isHidden: true }); if (cmd === '--squirrel-uninstall') {