From d372060425f2938cc6ea2f4b4bb893073421ffa6 Mon Sep 17 00:00:00 2001
From: Simon Rho <srho@juniper.net>
Date: Thu, 5 Sep 2024 00:58:46 -0400
Subject: [PATCH] Add Bastion Host support

---
 .github/workflows/build.yml |  4 +--
 jccm/forge.config.js        | 53 +++++++++++++++++--------------------
 2 files changed, 26 insertions(+), 31 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index c9cd6b7..dbec91a 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -82,13 +82,13 @@ jobs:
             - name: Build and package (arm64)
               run: |
                   source myenv/bin/activate
-                  npm run make -- --arch=arm64
+                  run make -- --platform=darwin --arch=arm64
               working-directory: ./jccm
 
             - name: Build and package (x64)
               run: |
                   source myenv/bin/activate
-                  npm run make -- --arch=x64
+                  run make -- --platform=darwin --arch=x64
               working-directory: ./jccm
 
             - name: Notarize and Staple Packages
diff --git a/jccm/forge.config.js b/jccm/forge.config.js
index 9c83b6f..8ba88d7 100644
--- a/jccm/forge.config.js
+++ b/jccm/forge.config.js
@@ -5,6 +5,9 @@ const { FuseV1Options, FuseVersion } = require('@electron/fuses');
 
 console.log(`Current working directory: ${process.cwd()}`);
 
+let platformOption;
+let archOption;
+
 module.exports = {
     packagerConfig: {
         asar: true,
@@ -18,48 +21,24 @@ module.exports = {
             teamId: process.env.APPLE_DEVELOPER_TEAM_ID,
         },
     },
-    rebuildConfig: {},
+    rebuildConfig: { force: true },
     makers: [
         {
-            name: '@electron-forge/maker-dmg',
+            name: '@electron-forge/maker-pkg',
+            platforms: ['darwin'],
             config: {
                 icon: path.join(__dirname, 'assets/icons/AppIcon.icns'), // Icon for macOS DMG
-                overwrite: true,
                 format: 'ULFO', // Optional: Customize DMG format
-                out: path.join(__dirname, 'out/make/darwin-arm64'),
-                name: 'jccm-darwin-arm64',
-                arch: 'arm64',
+                overwrite: true,
             },
         },
         {
             name: '@electron-forge/maker-dmg',
+            platforms: ['darwin'],
             config: {
                 icon: path.join(__dirname, 'assets/icons/AppIcon.icns'), // Icon for macOS DMG
-                overwrite: true,
                 format: 'ULFO', // Optional: Customize DMG format
-                out: path.join(__dirname, 'out/make/darwin-x64'),
-                name: 'jccm-darwin-x64',
-                arch: 'x64',
-            },
-        },
-        {
-            name: '@electron-forge/maker-pkg',
-            config: {
                 overwrite: true,
-                out: path.join(__dirname, 'out/make/darwin-arm64'),
-                name: 'jccm-darwin-arm64',
-                icon: path.join(__dirname, 'assets/icons/AppIcon.icns'), // Use the same icon as for DMG
-                arch: 'arm64',
-            },
-        },
-        {
-            name: '@electron-forge/maker-pkg',
-            config: {
-                overwrite: true,
-                out: path.join(__dirname, 'out/make/darwin-x64'),
-                name: 'jccm-darwin-x64',
-                icon: path.join(__dirname, 'assets/icons/AppIcon.icns'), // Use the same icon as for DMG
-                arch: 'x64',
             },
         },
         {
@@ -98,6 +77,22 @@ module.exports = {
             },
         },
     ],
+    hooks: {
+        generateAssets: async (config, platform, arch) => {
+            platformOption = platform ? platform : process.platform;
+            archOption = arch ? arch : process.arch;
+        },
+        preMake: async (config) => {
+            const makerPkg = config.makers.find((maker) => maker.name === '@electron-forge/maker-pkg');
+            const makerDmg = config.makers.find((maker) => maker.name === '@electron-forge/maker-dmg');
+
+            const name = `jccm-darwin-${archOption}`;
+
+            // Update the name in the maker's config to reflect the architecture passed in via the CLI
+            makerPkg.config.name = name;
+            makerDmg.config.name = name;
+        },
+    },
     plugins: [
         {
             name: '@electron-forge/plugin-auto-unpack-natives',