From 72bd3bc46f93f5a436100d68816c829b8d3ea7e7 Mon Sep 17 00:00:00 2001
From: Kyle Spearrin <kyle.spearrin@gmail.com>
Date: Tue, 1 Oct 2019 17:29:52 -0400
Subject: [PATCH] allow dmg and mas builds

---
 jslib                    |  2 +-
 scripts/after-sign.js    |  2 ++
 scripts/safari-build.ps1 | 12 +++++++++---
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/jslib b/jslib
index 53d08067..034aefa6 160000
--- a/jslib
+++ b/jslib
@@ -1 +1 @@
-Subproject commit 53d08067df953e7a66ebf0b972e6443e1f275d86
+Subproject commit 034aefa652459c9ed5a660fe13593e314ee368dc
diff --git a/scripts/after-sign.js b/scripts/after-sign.js
index ba1b66e9..1cee5b01 100644
--- a/scripts/after-sign.js
+++ b/scripts/after-sign.js
@@ -14,10 +14,12 @@ async function run(context) {
     const macBuild = context.electronPlatformName === 'darwin';
 
     if (macBuild) {
+        /*
         console.log('### Sign App w/ Safari Extension');
         const proc = child.spawn('gulp', ['signMac']);
         stdOutProc(proc);
         await new Promise((resolve) => proc.on('close', resolve));
+        */
 
         console.log('### Notarizing ' + appPath);
         return await notarize({
diff --git a/scripts/safari-build.ps1 b/scripts/safari-build.ps1
index 1235d10d..11153f73 100644
--- a/scripts/safari-build.ps1
+++ b/scripts/safari-build.ps1
@@ -1,5 +1,6 @@
 param (
-    [string] $version
+    [string] $version,
+    [switch] $mas
 )
 
 # Dependencies:
@@ -12,7 +13,8 @@ $dir = Split-Path -Parent $MyInvocation.MyCommand.Path;
 $rootDir = $dir + "\..";
 $distDir = $rootDir + "\dist";
 $distSafariDir = $distDir + "\safari";
-$distSafariAppex = $distSafariDir + "\browser\dist\Safari\build\Release\safari.appex";
+$distSafariAppexDmg = $distSafariDir + "\browser\dist\Safari\dmg\build\Release\safari.appex";
+$distSafariAppexMas = $distSafariDir + "\browser\dist\Safari\mas\build\Release\safari.appex";
 $pluginsAppex = $rootDir + "\PlugIns\safari.appex";
 
 if(Test-Path -Path $distSafariDir) {
@@ -35,5 +37,9 @@ if(-not ([string]::IsNullOrEmpty($version))) {
 
 npm i
 npm run dist:safari
-Copy-Item -Path $distSafariAppex -Destination $pluginsAppex –Recurse
+if($mas) {
+  Copy-Item -Path $distSafariAppexMas -Destination $pluginsAppex –Recurse
+} else {
+  Copy-Item -Path $distSafariAppexDmg -Destination $pluginsAppex –Recurse
+}
 cd $rootDir