From 93c9bc67bcb09255c5910f6369a2fa2b55abb9f5 Mon Sep 17 00:00:00 2001
From: Eugene Pankov <e@ajenti.org>
Date: Sun, 26 Feb 2023 18:04:36 +0100
Subject: [PATCH] wip

---
 build/mac/afterBuildHook.js | 16 ----------------
 build/mac/afterSignHook.js  | 35 -----------------------------------
 electron-builder.yml        |  4 ++--
 3 files changed, 2 insertions(+), 53 deletions(-)
 delete mode 100644 build/mac/afterBuildHook.js
 delete mode 100644 build/mac/afterSignHook.js

diff --git a/build/mac/afterBuildHook.js b/build/mac/afterBuildHook.js
deleted file mode 100644
index ae04bd08..00000000
--- a/build/mac/afterBuildHook.js
+++ /dev/null
@@ -1,16 +0,0 @@
-const fs = require('fs')
-const signHook = require('./afterSignHook')
-
-module.exports = async function (params) {
-    // notarize the app on Mac OS only.
-    if (process.platform !== 'darwin' || !process.env.GITHUB_REF || !process.env.GITHUB_REF.startsWith('refs/tags/')) {
-        return
-    }
-    console.log('afterBuild hook triggered')
-
-    let pkgName = fs.readdirSync('dist').find(x => x.endsWith('.pkg'))
-    signHook({
-        appOutDir: 'dist',
-        _pathOverride: pkgName,
-    })
-}
diff --git a/build/mac/afterSignHook.js b/build/mac/afterSignHook.js
deleted file mode 100644
index bad98de0..00000000
--- a/build/mac/afterSignHook.js
+++ /dev/null
@@ -1,35 +0,0 @@
-// See: https://medium.com/@TwitterArchiveEraser/notarize-electron-apps-7a5f988406db
-
-const fs = require('fs')
-const path = require('path')
-const notarizer = require('electron-notarize')
-
-module.exports = async function (params) {
-    // notarize the app on Mac OS only.
-    if (process.platform !== 'darwin' || !process.env.GITHUB_REF || !process.env.GITHUB_REF.startsWith('refs/tags/')) {
-        return
-    }
-    console.log('afterSign hook triggered', params)
-
-    let appId = 'org.tabby'
-
-    let appPath = path.join(params.appOutDir, params._pathOverride || `${params.packager.appInfo.productFilename}.app`)
-    if (!fs.existsSync(appPath)) {
-        throw new Error(`Cannot find application at: ${appPath}`)
-    }
-
-    console.log(`Notarizing ${appId} found at ${appPath}`)
-
-    try {
-        await notarizer.notarize({
-            appBundleId: appId,
-            appPath: appPath,
-            appleId: process.env.APPSTORE_USERNAME,
-            appleIdPassword: process.env.APPSTORE_PASSWORD,
-        })
-    } catch (error) {
-        console.error(error)
-    }
-
-    console.log(`Done notarizing ${appId}`)
-}
diff --git a/electron-builder.yml b/electron-builder.yml
index 80fd9bb2..914147dc 100644
--- a/electron-builder.yml
+++ b/electron-builder.yml
@@ -3,8 +3,8 @@ appId: org.tabby
 productName: Tabby
 compression: normal
 npmRebuild: false
-afterSign: "./build/mac/afterSignHook.js"
-afterAllArtifactBuild: "./build/mac/afterBuildHook.js"
+afterSign: "./build/mac/afterSignHook.cjs"
+afterAllArtifactBuild: "./build/mac/afterBuildHook.cjs"
 files:
 - '**/*'
 - dist