From 13384b4c28160102d9b7752eaabd004b7e66c48e Mon Sep 17 00:00:00 2001
From: Kyle Spearrin <kyle.spearrin@gmail.com>
Date: Mon, 14 Oct 2019 10:47:53 -0400
Subject: [PATCH] Revert "hardened runtime for mas builds"

This reverts commit 3ce77adcb4b614c833ad52796f0756911a3ed49f.
---
 gulpfile.js | 25 ++++++++++++++++---------
 1 file changed, 16 insertions(+), 9 deletions(-)

diff --git a/gulpfile.js b/gulpfile.js
index d085c7bec8..347c1314b3 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -185,21 +185,28 @@ function distSafariApp(cb, subBuildPath) {
     const builtAppexPath = buildPath + 'build/Release/safari.appex';
     const builtAppexFrameworkPath = buildPath + 'build/Release/safari.appex/Contents/Frameworks/';
     const entitlementsPath = paths.safari + 'safari/safari.entitlements';
-    let devId = 'Developer ID Application: 8bit Solutions LLC';
-    if (subBuildPath !== 'dmg') {
-        devId = subBuildPath === 'mas' ? '3rd Party Mac Developer Application: 8bit Solutions LLC' :
-            'C12A12E8595453C8B57028790FADB6AD426165AE';
-    }
-    var signArgs = [
+    var args = [
         '--verbose',
         '--force',
         '-o',
         'runtime',
         '--sign',
-        devId,
+        'Developer ID Application: 8bit Solutions LLC',
         '--entitlements',
         entitlementsPath
     ];
+    if (subBuildPath !== 'dmg') {
+        args = [
+            '--verbose',
+            '--force',
+            '--sign',
+            subBuildPath === 'mas' ? '3rd Party Mac Developer Application: 8bit Solutions LLC' :
+                'C12A12E8595453C8B57028790FADB6AD426165AE',
+            '--entitlements',
+            entitlementsPath
+        ];
+    }
+
     return del([buildPath + '**/*'])
         .then(() => safariCopyAssets(paths.safari + '**/*', buildPath))
         .then(() => safariCopyBuild(paths.build + '**/*', buildPath + 'safari/app'))
@@ -217,13 +224,13 @@ function distSafariApp(cb, subBuildPath) {
                 .map((p) => builtAppexFrameworkPath + p);
             const libPromises = [];
             libs.forEach((i) => {
-                const proc = child.spawn('codesign', signArgs.concat([i]));
+                const proc = child.spawn('codesign', args.concat([i]));
                 stdOutProc(proc);
                 libPromises.push(new Promise((resolve) => proc.on('close', resolve)));
             });
             return Promise.all(libPromises);
         }).then(() => {
-            const proc = child.spawn('codesign', signArgs.concat([builtAppexPath]));
+            const proc = child.spawn('codesign', args.concat([builtAppexPath]));
             stdOutProc(proc);
             return new Promise((resolve) => proc.on('close', resolve));
         }).then(() => {