fix(mac): Remove redundant signing op for mas and mas-dev targets (#4321

)
electron-userland · Oct 22, 2019 · 5692281 · patrickmichalina · Dec 9, 2019 · gaodeng
1 parent f858f9e
commit 5692281
Showing 1 changed file with 15 additions and 7 deletions.
diff --git a/packages/app-builder-lib/src/macPackager.ts b/packages/app-builder-lib/src/macPackager.ts
@@ -88,10 +88,14 @@ export default class MacPackager extends PlatformPackager<MacConfiguration> {
     }
   }
 
+  private hasMasTarget(targets: Array<Target>) {
+    return targets.length !== 0 && targets.some(it => it.name === "mas" || it.name === "mas-dev")
+  }
+
   async pack(outDir: string, arch: Arch, targets: Array<Target>, taskManager: AsyncTaskManager): Promise<any> {
     let nonMasPromise: Promise<any> | null = null
 
-    const hasMas = targets.length !== 0 && targets.some(it => it.name === "mas" || it.name === "mas-dev")
+    const hasMas = this.hasMasTarget(targets)
     const prepackaged = this.packagerOptions.prepackaged
 
     if (!hasMas || targets.length > 1) {
@@ -323,12 +327,16 @@ export default class MacPackager extends PlatformPackager<MacConfiguration> {
   protected async signApp(packContext: AfterPackContext, isAsar: boolean): Promise<any> {
     const appFileName = `${this.appInfo.productFilename}.app`
 
-    await BluebirdPromise.map(readdir(packContext.appOutDir), (file: string): any => {
-      if (file === appFileName) {
-        return this.sign(path.join(packContext.appOutDir, file), null, null)
-      }
-      return null
-    })
+    const hasMas = this.hasMasTarget(packContext.targets)
+    // No need to sign on mas targets since we sign the folder on pack()
+    if (!hasMas) {
+      await BluebirdPromise.map(readdir(packContext.appOutDir), (file: string): any => {
+        if (file === appFileName) {
+          return this.sign(path.join(packContext.appOutDir, file), null, null)
+        }
+        return null
+      })
+    }
 
     if (!isAsar) {
       return