Skip to content

Commit cd8ed8c

Browse files
Apply PR #27953: fix(desktop): install the latest available update
2 parents 5d3f2d9 + c1cc056 commit cd8ed8c

1 file changed

Lines changed: 4 additions & 12 deletions

File tree

packages/desktop/src/main/updater.ts

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@ import { initLogging } from "./logging"
66
const logger = initLogging()
77
const { autoUpdater } = pkg
88

9-
let downloadedUpdateVersion: string | undefined
10-
119
export function setupAutoUpdater() {
1210
if (!UPDATER_ENABLED) return
1311
autoUpdater.logger = logger
@@ -26,12 +24,6 @@ export function setupAutoUpdater() {
2624

2725
export async function checkUpdate() {
2826
if (!UPDATER_ENABLED) return { updateAvailable: false }
29-
if (downloadedUpdateVersion) {
30-
logger.log("returning cached downloaded update", {
31-
version: downloadedUpdateVersion,
32-
})
33-
return { updateAvailable: true, version: downloadedUpdateVersion }
34-
}
3527
logger.log("checking for updates", {
3628
currentVersion: app.getVersion(),
3729
channel: autoUpdater.channel,
@@ -57,7 +49,6 @@ export async function checkUpdate() {
5749
logger.log("update available", { version })
5850
await autoUpdater.downloadUpdate()
5951
logger.log("update download completed", { version })
60-
downloadedUpdateVersion = version
6152
return { updateAvailable: true, version }
6253
} catch (error) {
6354
logger.error("update check failed", error)
@@ -66,14 +57,15 @@ export async function checkUpdate() {
6657
}
6758

6859
export async function installUpdate(killSidecar: () => Promise<void>) {
69-
if (!downloadedUpdateVersion) {
60+
const result = await checkUpdate()
61+
if (!result.updateAvailable) {
7062
logger.log("install update skipped", {
71-
reason: "no downloaded update ready",
63+
reason: result.failed ? "update check failed" : "no update available",
7264
})
7365
return
7466
}
7567
logger.log("installing downloaded update", {
76-
version: downloadedUpdateVersion,
68+
version: result.version ?? null,
7769
})
7870
await killSidecar()
7971
autoUpdater.quitAndInstall()

0 commit comments

Comments
 (0)