rev/hyperX
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Make builds work again and catch squirrel errors on windows (#2078)

Browse source 
* Catch errors for electron-squirrel-startup

* Made builds work again

* linting

* linting
This commit is contained in:
Andy 2017-08-13 07:03:35 +02:00 • committed by Leo Lamprecht
parent be8e0cce29
commit de8e70f935
6 changed files with 26 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/index.html
View file

@ -31,7 +31,7 @@
<div id="mount"></div>
<script>start = performance.now();</script>
<script src="dist/bundle.js"></script>
<script src="renderer/bundle.js"></script>
<script>console.log('total init time', performance.now() - start);</script>
</body>
</html>

22
app/index.js
View file

@ -9,6 +9,19 @@ if (['--help', '-v', '--version'].includes(process.argv[1])) {
process.exit();
}
const checkSquirrel = () => {
let squirrel;
try {
squirrel = require('electron-squirrel-startup');
} catch (err) {}
if (squirrel) {
// eslint-disable-next-line unicorn/no-process-exit
process.exit();
}
};
// handle startup squirrel events
if (process.platform === 'win32') {
// eslint-disable-next-line import/order
@ -18,19 +31,16 @@ if (process.platform === 'win32') {
case '--squirrel-install':
case '--squirrel-updated':
systemContextMenu.add(() => {
// eslint-disable-next-line curly, unicorn/no-process-exit
if (require('electron-squirrel-startup')) process.exit();
checkSquirrel();
});
break;
case '--squirrel-uninstall':
systemContextMenu.remove(() => {
// eslint-disable-next-line curly, unicorn/no-process-exit
if (require('electron-squirrel-startup')) process.exit();
checkSquirrel();
});
break;
default:
// eslint-disable-next-line curly, unicorn/no-process-exit
if (require('electron-squirrel-startup')) process.exit();
checkSquirrel();
}
}