diff --git a/package.json b/package.json index 096769731e..2b3fd43f4c 100644 --- a/package.json +++ b/package.json @@ -216,7 +216,7 @@ "conf": "^7.1.2", "crypto-js": "^4.1.1", "electron-devtools-installer": "^3.2.0", - "electron-updater": "^4.6.1", + "electron-updater": "^4.6.5", "electron-window-state": "^5.0.3", "filehound": "^1.17.5", "fs-extra": "^9.0.1", diff --git a/src/main/app-updater.ts b/src/main/app-updater.ts index b30d799677..4834a90234 100644 --- a/src/main/app-updater.ts +++ b/src/main/app-updater.ts @@ -5,11 +5,11 @@ import { autoUpdater, UpdateInfo } from "electron-updater"; import logger from "./logger"; -import { isLinux, isMac, isPublishConfigured, isTestEnv } from "../common/vars"; +import { isPublishConfigured, isTestEnv } from "../common/vars"; import { delay } from "../common/utils"; import { areArgsUpdateAvailableToBackchannel, AutoUpdateChecking, AutoUpdateLogPrefix, AutoUpdateNoUpdateAvailable, broadcastMessage, onceCorrect, UpdateAvailableChannel, UpdateAvailableToBackchannel } from "../common/ipc"; import { once } from "lodash"; -import { ipcMain, autoUpdater as electronAutoUpdater } from "electron"; +import { ipcMain } from "electron"; import { nextUpdateChannel } from "./utils/update-channel"; import { UserStore } from "../common/user-store"; @@ -23,25 +23,7 @@ function handleAutoUpdateBackChannel(event: Electron.IpcMainEvent, ...[arg]: Upd if (arg.doUpdate) { if (arg.now) { logger.info(`${AutoUpdateLogPrefix}: User chose to update now`); - setImmediate(() => { - if (isMac) { - /** - * 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(); - } else if (isLinux) { - /** - * This is a necessary workaround until electron-updater is fixed. - * The problem is that because linux updating is not implemented at - * all via electron. Electron's autoUpdater.quitAndInstall() is never - * called. - */ - electronAutoUpdater.emit("before-quit-for-update"); - } - autoUpdater.quitAndInstall(true, true); - }); + autoUpdater.quitAndInstall(true, true); } else { logger.info(`${AutoUpdateLogPrefix}: User chose to update on quit`); autoUpdater.autoInstallOnAppQuit = true; diff --git a/yarn.lock b/yarn.lock index 29b458b062..655e196ef7 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3290,14 +3290,6 @@ buffer@^5.1.0, buffer@^5.5.0: base64-js "^1.0.2" ieee754 "^1.1.4" -builder-util-runtime@8.9.1: - version "8.9.1" - resolved "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-8.9.1.tgz#25f066b3fbc20b3e6236a9b956b1ebb0e33ff66a" - integrity sha512-c8a8J3wK6BIVLW7ls+7TRK9igspTbzWmUqxFbgK0m40Ggm6efUbxtWVCGIjc+dtchyr5qAMAUL6iEGRdS/6vwg== - dependencies: - debug "^4.3.2" - sax "^1.2.4" - builder-util-runtime@8.9.2: version "8.9.2" resolved "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-8.9.2.tgz#a9669ae5b5dcabfe411ded26678e7ae997246c28" @@ -4919,13 +4911,13 @@ electron-to-chromium@^1.4.17: resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.57.tgz#2b2766df76ac8dbc0a1d41249bc5684a31849892" integrity sha512-FNC+P5K1n6pF+M0zIK+gFCoXcJhhzDViL3DRIGy2Fv5PohuSES1JHR7T+GlwxSxlzx4yYbsuzCZvHxcBSRCIOw== -electron-updater@^4.6.1: - version "4.6.1" - resolved "https://registry.yarnpkg.com/electron-updater/-/electron-updater-4.6.1.tgz#80ca805c4f51b2e682aac29d18fed75d6a533d32" - integrity sha512-YsU1mHqXLrXXmBMsxhxy24PrbaB8rnpZDPmFa2gOkTYk/Ch13+R0fjsRSpPYvqtskVVY0ux8fu+HnUkVkqc7og== +electron-updater@^4.6.5: + version "4.6.5" + resolved "https://registry.yarnpkg.com/electron-updater/-/electron-updater-4.6.5.tgz#e9a75458bbfd6bb41a58a829839e150ad2eb2d3d" + integrity sha512-kdTly8O9mSZfm9fslc1mnCY+mYOeaYRy7ERa2Fed240u01BKll3aiupzkd07qKw69KvhBSzuHroIW3mF0D8DWA== dependencies: "@types/semver" "^7.3.6" - builder-util-runtime "8.9.1" + builder-util-runtime "8.9.2" fs-extra "^10.0.0" js-yaml "^4.1.0" lazy-val "^1.0.5"