hendrik/lens
1
0
Fork 0
mirror of https://github.com/lensapp/lens.git synced 2025-05-20 05:10:56 +00:00
Code Issues Projects Releases Wiki Activity

Fix auto-update on macOS not working (#4248)

Browse Source
This commit is contained in:
Sebastian Malton 2021-11-03 16:29:50 -04:00 committed by GitHub
parent 28e182a2a3
commit a93108c103
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/main/app-updater.ts
View File

@ -21,14 +21,14 @@
import { autoUpdater, UpdateInfo } from "electron-updater"; import { autoUpdater, UpdateInfo } from "electron-updater";
import logger from "./logger"; import logger from "./logger";
import { isDevelopment, isPublishConfigured, isTestEnv } from "../common/vars"; import { isDevelopment, isMac, isPublishConfigured, isTestEnv } from "../common/vars";
import { delay } from "../common/utils"; import { delay } from "../common/utils";
import { areArgsUpdateAvailableToBackchannel, AutoUpdateLogPrefix, broadcastMessage, onceCorrect, UpdateAvailableChannel, UpdateAvailableToBackchannel } from "../common/ipc"; import { areArgsUpdateAvailableToBackchannel, AutoUpdateLogPrefix, broadcastMessage, onceCorrect, UpdateAvailableChannel, UpdateAvailableToBackchannel } from "../common/ipc";
import { once } from "lodash"; import { once } from "lodash";
import { app, ipcMain } from "electron"; import { ipcMain } from "electron";
import { nextUpdateChannel } from "./utils/update-channel"; import { nextUpdateChannel } from "./utils/update-channel";
import { UserStore } from "../common/user-store"; import { UserStore } from "../common/user-store";
import { WindowManager } from "./window-manager"; import { autoUpdater as electronAutoUpdater } from "electron";
let installVersion: null | string = null; let installVersion: null | string = null;
@ -41,8 +41,14 @@ function handleAutoUpdateBackChannel(event: Electron.IpcMainEvent, ...[arg]: Upd
if (arg.now) { if (arg.now) {
logger.info(`${AutoUpdateLogPrefix}: User chose to update now`); logger.info(`${AutoUpdateLogPrefix}: User chose to update now`);
setImmediate(() => { setImmediate(() => {
app.removeAllListeners("window-all-closed"); if (isMac) {
WindowManager.getInstance().destroy(); /**
* This is a necessary workaround until electron-updater is fixed.
* The problem is that it downloads it but then never tries to
* download it from itself via electron.
*/
electronAutoUpdater.checkForUpdates();
}
autoUpdater.quitAndInstall(true, true); autoUpdater.quitAndInstall(true, true);
}); });
} else { } else {
@ -65,7 +71,12 @@ export const startUpdateChecking = once(function (interval = 1000 * 60 * 60 * 24
const userStore = UserStore.getInstance(); const userStore = UserStore.getInstance();
autoUpdater.logger = logger; autoUpdater.logger = {
info: message => logger.info(`[AUTO-UPDATE]: electron-updater: ${message}`),
warn: message => logger.warn(`[AUTO-UPDATE]: electron-updater: ${message}`),
error: message => logger.error(`[AUTO-UPDATE]: electron-updater: ${message}`),
debug: message => logger.debug(`[AUTO-UPDATE]: electron-updater: ${message}`),
};
autoUpdater.autoDownload = false; autoUpdater.autoDownload = false;
autoUpdater.autoInstallOnAppQuit = false; autoUpdater.autoInstallOnAppQuit = false;
autoUpdater.channel = userStore.updateChannel; autoUpdater.channel = userStore.updateChannel;