fix: osx code sign regression

Closes #377

Author: develar

.gitattributes

@@ -2,4 +2,4 @@
 *.ico filter=lfs diff=lfs merge=lfs -text
 *.icns filter=lfs diff=lfs merge=lfs -text
 vendor/**/* filter=lfs diff=lfs merge=lfs -text
-*.gif filter=lfs diff=lfs merge=lfs -text
+*.gif filter=lfs diff=lfs merge=lfs -text

certs/AppleWWDRCA.cer

@@ -5,7 +5,8 @@
   "main": "out/index.js",
   "files": [
     "out",
-    "templates"
+    "templates",
+    "certs"
   ],
   "bin": {
     "build": "./out/build-cli.js",
@@ -62,7 +63,7 @@
     "compare-versions": "^2.0.1",
     "debug": "^2.2.0",
     "deep-assign": "^2.0.0",
-    "electron-osx-sign-tf": "~0.5.0-beta.0",
+    "electron-osx-sign-tf": "0.4.0-beta.0",
     "electron-packager-tf": "^7.0.2-beta.0",
     "electron-winstaller-fixed": "~2.4.0-beta.1",
     "fs-extra-p": "^1.0.1",
@@ -76,8 +77,7 @@
     "read-package-json": "^2.0.4",
     "signcode-tf": "^0.5.0",
     "source-map-support": "^0.4.0",
-    "tmp": "0.0.28",
-    "typescript": "^1.9.0-dev.20160503"
+    "tmp": "0.0.28"
   },
   "optionalDependencies": {
     "appdmg-tf": "^0.3.11"
@@ -106,7 +106,7 @@
     "ts-babel": "^0.8.6",
     "tsconfig-glob": "^0.4.3",
     "tslint": "next",
-    "typescript": "^1.9.0-dev.20160414",
+    "typescript": "^1.9.0-dev.20160504",
     "whitespace": "^2.0.0"
   },
   "babel": {
@@ -123,8 +123,5 @@
       "test/out/*"
     ]
   },
-  "typings": "./out/electron-builder.d.ts",
-  "publishConfig": {
-    "tag": "next"
-  }
+  "typings": "./out/electron-builder.d.ts"
 }

package.json

@@ -26,11 +26,7 @@ export function generateKeychainName(): string {
 }
 
 export function createKeychain(keychainName: string, cscLink: string, cscKeyPassword: string, cscILink?: string | null, cscIKeyPassword?: string | null, csaLink?: string | null): Promise<CodeSigningInfo> {
-  const certLinks = [csaLink || "https://developer.apple.com/certificationauthority/AppleWWDRCA.cer"]
-  if (csaLink == null) {
-    certLinks.push("https://startssl.com/certs/sca.code2.crt", "https://startssl.com/certs/sca.code3.crt")
-  }
-
+  const certLinks = csaLink == null ? ["https://startssl.com/certs/sca.code2.crt", "https://startssl.com/certs/sca.code3.crt"] : [csaLink]
   certLinks.push(cscLink)
   if (cscILink != null) {
     certLinks.push(cscILink)
@@ -46,7 +42,7 @@ export function createKeychain(keychainName: string, cscLink: string, cscKeyPass
         ["set-keychain-settings", "-t", "3600", "-u", keychainName]
       ], it => exec("security", it))
     ])
-    .then(() => importCerts(keychainName, certPaths, [cscKeyPassword, cscIKeyPassword].filter(it => it != null))),
+    .then(() => importCerts(keychainName, certPaths, [cscKeyPassword, cscIKeyPassword].filter(it => it != null), csaLink == null)),
     errorOccurred => {
       const tasks = certPaths.map(it => deleteFile(it, true))
       if (errorOccurred) {
@@ -56,9 +52,13 @@ export function createKeychain(keychainName: string, cscLink: string, cscKeyPass
     })
 }
 
-async function importCerts(keychainName: string, paths: Array<string>, keyPasswords: Array<string | null | undefined>): Promise<CodeSigningInfo> {
+async function importCerts(keychainName: string, paths: Array<string>, keyPasswords: Array<string | null | undefined>, importAppleCerts: boolean): Promise<CodeSigningInfo> {
   for (let f of paths.slice(0, -keyPasswords.length)) {
-    await exec("security", ["import", f!, "-k", keychainName, "-T", "/usr/bin/codesign"])
+    await exec("security", ["import", f, "-k", keychainName, "-T", "/usr/bin/codesign"])
+  }
+
+  if (importAppleCerts) {
+    await exec("security", ["import", path.join(__dirname, "..", "certs", "AppleWWDRCA.cer"), "-k", keychainName, "-T", "/usr/bin/codesign"])
   }
 
   const namePromises: Array<Promise<string>> = []