Foundry376/Mailspring
1
1
Fork 0
mirror of https://github.com/Foundry376/Mailspring.git synced 2024-09-22 16:26:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

[client-app] properly relaunch windows on autoupdate

Browse source
This commit is contained in:
Evan Morikawa 2017-03-28 16:14:55 -07:00
parent 6202a4618e
commit 212dd4439a
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
packages/client-app/src/browser/windows-updater-squirrel-adapter.coffee
View file

@ -11,7 +11,7 @@ class WindowsUpdaterSquirrelAdapter
if WindowsUpdater.existsSync()
WindowsUpdater.restartN1(require('electron').app)
else
NylasEnv.reportError(new Error("SquirrelUpdate does not exist"))
console.error("SquirrelUpdate does not exist")
downloadUpdate: (callback) ->
WindowsUpdater.spawn ['--download', @updateUrl], (error, stdout) ->

10
packages/client-app/src/browser/windows-updater.js
View file

@ -40,12 +40,12 @@ const exeName = path.basename(process.execPath);
// Spawn a command and invoke the callback when it completes with an error
// and the output from standard out.
function spawn(command, args, callback) {
function spawn(command, args, callback, options = {}) {
let stdout = ''
let spawnedProcess = null;
try {
spawnedProcess = ChildProcess.spawn(command, args);
spawnedProcess = ChildProcess.spawn(command, args, options);
} catch (error) {
// Spawn can throw an error
setTimeout(() => callback && callback(error, stdout), 0)
@ -77,8 +77,8 @@ function spawn(command, args, callback) {
// Spawn the Update.exe with the given arguments and invoke the callback when
// the command completes.
function spawnUpdate(args, callback) {
spawn(updateDotExe, args, callback);
function spawnUpdate(args, callback, options = {}) {
spawn(updateDotExe, args, callback, options);
}
// Create a desktop and start menu shortcut by using the command line API
@ -165,7 +165,7 @@ exports.existsSync = () => fs.existsSync(updateDotExe)
// Restart N1 using the version pointed to by the N1.cmd shim
exports.restartN1 = (app) => {
app.once('will-quit', () => {
spawnUpdate(['--processStart', exeName]);
spawnUpdate(['--processStart', exeName], (() => {}), {detached: true});
});
app.quit();
}