Fix universal build after last npm audit fix

1 files changed, 15 insertions, 9 deletions

diff --git a/gui/tasks/distribution.js b/gui/tasks/distribution.js
index 87a07d3c96..cee853748a 100644
--- a/gui/tasks/distribution.js
+++ b/gui/tasks/distribution.js
@@ -1,6 +1,7 @@
 const path = require('path');
 const fs = require('fs');
 const builder = require('electron-builder');
+const { Arch } = require('electron-builder');
 const parseSemver = require('semver/functions/parse');
 const { notarize } = require('electron-notarize');
 const { version } = require('../package.json');
@@ -49,14 +50,16 @@ const config = {
 
   // Make sure that all files declared in "extraResources" exists and abort if they don't.
   afterPack: (context) => {
-    const resources = context.packager.platformSpecificBuildOptions.extraResources;
-    for (const resource of resources) {
-      const filePath = resource.from.replace(/\$\{env\.(.*)\}/, function (match, captureGroup) {
-        return process.env[captureGroup];
-      });
+    if (context.arch !== Arch.universal) {
+      const resources = context.packager.platformSpecificBuildOptions.extraResources;
+      for (const resource of resources) {
+        const filePath = resource.from.replace(/\$\{env\.(.*)\}/, function (match, captureGroup) {
+          return process.env[captureGroup];
+        });
 
-      if (!fs.existsSync(filePath)) {
-        throw new Error(`Can't find file: ${filePath}`);
+        if (!fs.existsSync(filePath)) {
+          throw new Error(`Can't find file: ${filePath}`);
+        }
       }
     }
   },
@@ -248,8 +251,11 @@ function packMac() {
       afterPack: (context) => {
         config.afterPack?.(context);
 
-        delete process.env.TARGET_TRIPLE;
-        appOutDirs.push(context.appOutDir);
+        if (context.arch !== Arch.universal) {
+          delete process.env.TARGET_TRIPLE;
+          appOutDirs.push(context.appOutDir);
+        }
+
         return Promise.resolve();
       },
       afterAllArtifactBuild: async (buildResult) => {