Pass buildOptions down to notarization to explicitly pull build options

electron-userland · Nov 18, 2023 · 57fda9b · 57fda9b
1 parent 9883ab6
commit 57fda9b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/packages/app-builder-lib/src/macPackager.ts b/packages/app-builder-lib/src/macPackager.ts
@@ -332,7 +332,7 @@ export default class MacPackager extends PlatformPackager<MacConfiguration> {
     }
 
     if (!isMas) {
-      await this.notarizeIfProvided(appPath)
+      await this.notarizeIfProvided(appPath, options)
     }
     return true
   }
@@ -481,10 +481,10 @@ export default class MacPackager extends PlatformPackager<MacConfiguration> {
     return true
   }
 
-  private async notarizeIfProvided(appPath: string) {
-    const notarizeOptions = this.platformSpecificBuildOptions.notarize
-    if (notarizeOptions === false) {
-      log.info({ reason: "`notarizeOptions` is explicitly set to false" }, "skipped macOS notarization")
+  private async notarizeIfProvided(appPath: string, buildOptions: MacConfiguration) {
+    const notarizeOptions = buildOptions.notarize
+    if (!notarizeOptions) {
+      log.info({ reason: "`notarize` options were not provided" }, "skipped macOS notarization")
       return
     }
     const appleId = process.env.APPLE_ID

diff --git a/packages/app-builder-lib/src/targets/FlatpakTarget.ts b/packages/app-builder-lib/src/targets/FlatpakTarget.ts
@@ -84,7 +84,7 @@ export default class FlatpakTarget extends Target {
     const copyIcons = icons.map(async icon => {
       if (icon.size > 512) {
         // Flatpak does not allow icons larger than 512 pixels
-        return Promise.resolve();
+        return Promise.resolve()
       }
       const extWithDot = path.extname(icon.file)
       const sizeName = extWithDot === ".svg" ? "scalable" : `${icon.size}x${icon.size}`