fix: trigger app.relaunch() if isForceRunAfter = true for rpm and…

… deb updaters (#7637)
electron-userland · Jun 27, 2023 · b3dfe64 · b3dfe64
1 parent 8ae9061
commit b3dfe64
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 0 deletions.
diff --git a/.changeset/empty-pears-hammer.md b/.changeset/empty-pears-hammer.md
@@ -0,0 +1,5 @@
+---
+"electron-updater": patch
+---
+
+fix: trigger `app.relaunch()` if `isForceRunAfter = true` for (beta) deb and rpm updaters
diff --git a/packages/electron-updater/src/AppAdapter.ts b/packages/electron-updater/src/AppAdapter.ts
@@ -24,6 +24,8 @@ export interface AppAdapter {
 
   whenReady(): Promise<void>
 
+  relaunch(): void
+
   quit(): void
 
   onQuit(handler: (exitCode: number) => void): void

diff --git a/packages/electron-updater/src/DebUpdater.ts b/packages/electron-updater/src/DebUpdater.ts
@@ -33,6 +33,9 @@ export class DebUpdater extends BaseUpdater {
     const wrapper = /pkexec/i.test(sudo) ? "" : `"`
     const cmd = ["dpkg", "-i", options.installerPath, "||", "apt-get", "install", "-f", "-y"]
     this.spawnSyncLog(sudo, [`${wrapper}/bin/bash`, "-c", `'${cmd.join(" ")}'${wrapper}`])
+    if (options.isForceRunAfter) {
+      this.app.relaunch()
+    }
     return true
   }
 }
diff --git a/packages/electron-updater/src/ElectronAppAdapter.ts b/packages/electron-updater/src/ElectronAppAdapter.ts
@@ -36,6 +36,10 @@ export class ElectronAppAdapter implements AppAdapter {
     this.app.quit()
   }
 
+  relaunch(): void {
+    this.app.relaunch()
+  }
+
   onQuit(handler: (exitCode: number) => void): void {
     this.app.once("quit", (_: Event, exitCode: number) => handler(exitCode))
   }

diff --git a/packages/electron-updater/src/RpmUpdater.ts b/packages/electron-updater/src/RpmUpdater.ts
@@ -58,6 +58,9 @@ export class RpmUpdater extends BaseUpdater {
       ]
     }
     this.spawnSyncLog(sudo, [`${wrapper}/bin/bash`, "-c", `'${cmd.join(" ")}'${wrapper}`])
+    if (options.isForceRunAfter) {
+      this.app.relaunch()
+    }
     return true
   }
 }