configure forge platforms, add squirrel startup require

SiaFoundation · Jan 25, 2024 · 3672620 · 3672620
1 parent 5044718
commit 3672620
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 8 deletions.
diff --git a/hostd/electron-src/index.ts b/hostd/electron-src/index.ts
@@ -32,6 +32,11 @@ app.on('will-quit', async () => {
 // even though closing windows is not really possible
 app.on('window-all-closed', app.quit)
 
+// https://github.com/mongodb-js/electron-squirrel-startup
+if (require('electron-squirrel-startup')) {
+  app.quit()
+}
+
 async function quitDaemonAndApp() {
   state.isQuitting = true
   await stopDaemon()

diff --git a/hostd/forge.config.js b/hostd/forge.config.js
@@ -6,19 +6,31 @@ module.exports = {
   makers: [
     {
       name: '@electron-forge/maker-squirrel',
-      config: {},
+      platforms: ['win32'],
+      config: {
+        arch: ['x64'],
+      },
     },
     {
       name: '@electron-forge/maker-zip',
       platforms: ['darwin'],
+      config: {
+        arch: ['arm64', 'x64'],
+      },
     },
     {
       name: '@electron-forge/maker-deb',
-      config: {},
+      platforms: ['linux'],
+      config: {
+        arch: ['arm64', 'x64'],
+      },
     },
     {
       name: '@electron-forge/maker-rpm',
-      config: {},
+      platforms: ['linux'],
+      config: {
+        arch: ['arm64', 'x64'],
+      },
     },
   ],
   plugins: [
@@ -27,4 +39,4 @@ module.exports = {
       config: {},
     },
   ],
-};
+}
diff --git a/renterd/electron-src/index.ts b/renterd/electron-src/index.ts
@@ -32,6 +32,11 @@ app.on('will-quit', async () => {
 // even though closing windows is not really possible
 app.on('window-all-closed', app.quit)
 
+// https://github.com/mongodb-js/electron-squirrel-startup
+if (require('electron-squirrel-startup')) {
+  app.quit()
+}
+
 async function quitDaemonAndApp() {
   state.isQuitting = true
   await stopDaemon()

diff --git a/renterd/forge.config.js b/renterd/forge.config.js
@@ -6,19 +6,31 @@ module.exports = {
   makers: [
     {
       name: '@electron-forge/maker-squirrel',
-      config: {},
+      platforms: ['win32'],
+      config: {
+        arch: ['x64'],
+      },
     },
     {
       name: '@electron-forge/maker-zip',
       platforms: ['darwin'],
+      config: {
+        arch: ['arm64', 'x64'],
+      },
     },
     {
       name: '@electron-forge/maker-deb',
-      config: {},
+      platforms: ['linux'],
+      config: {
+        arch: ['arm64', 'x64'],
+      },
     },
     {
       name: '@electron-forge/maker-rpm',
-      config: {},
+      platforms: ['linux'],
+      config: {
+        arch: ['arm64', 'x64'],
+      },
     },
   ],
   plugins: [
@@ -27,4 +39,4 @@ module.exports = {
       config: {},
     },
   ],
-};
+}