Fix codesigning

tropy · Aug 29, 2019 · 9fdb82b · 9fdb82b
1 parent 28506de
commit 9fdb82b
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/scripts/build.js b/scripts/build.js
@@ -52,7 +52,7 @@ const IGNORE = [
   /^\/test/,
   /^\/tmp/,
   /node_modules.\.(bin|cache)/,
-  /node_modules.sqlite3.(build|deps|binding.node)/,
+  /node_modules.sqlite3.(build|deps|lib.binding.node)/,
   /node_modules.sharp.build.[^R]/,
   /node_modules.sharp.build.Release.obj/,
   /node_modules.sharp.vendor.include/,

diff --git a/scripts/sign.js b/scripts/sign.js
@@ -68,6 +68,11 @@ target.darwin = (args = []) => {
     cnt = join(app, 'Contents')
     check(test('-d', app), `app not found: ${app}`)
 
+    // Clear temporary files from previous signing
+    for (let file of find(`"${app}" -name "*.cstemp" -type f`)) {
+      if (file) rm(file)
+    }
+
     say(`signing ${relative(dir, app)} with ${identity}...`)
 
     for (let file of find(`"${join(cnt, 'Resources')}" -perm +111 -type f`)) {
@@ -78,18 +83,19 @@ target.darwin = (args = []) => {
       sign(file)
     }
 
-    for (let file of find(`"${join(cnt, 'MacOS')}" -perm +111 -type f`)) {
+    for (let file of find(`"${cnt}" -name "*.app" -type d`)) {
       sign(file)
     }
 
-    for (let file of find(`"${cnt}" -name "*.framework"`)) {
+    for (let file of find(`"${cnt}" -name "*.framework" -type d`)) {
       sign(file)
     }
 
-    for (let file of find(`"${cnt}" -name "*.app"`)) {
+    for (let file of find(`"${join(cnt, 'MacOS')}" -perm +111 -type f`)) {
       sign(file)
     }
 
+
     sign(app)
     verify(app)
   }