From 259f12b07ac21940abd12a29c16013d71ca15621 Mon Sep 17 00:00:00 2001
From: Andrew Gundersen <adgundersen@gmail.com>
Date: Fri, 13 May 2022 06:46:57 -0500
Subject: [PATCH] Fixing Git issue, updated notarize flow

---
 notarize.js | 43 +++++++++++++------------------------------
 1 file changed, 13 insertions(+), 30 deletions(-)

diff --git a/notarize.js b/notarize.js
index 10acfcb..cd3b19a 100644
--- a/notarize.js
+++ b/notarize.js
@@ -2,9 +2,8 @@ const exec = require('child_process').exec;
 const sign = require("electron-osx-sign").signAsync;
 const notarize = require("electron-notarize").notarize;
 
-const name = "Crimata";
-const dir = `${name}.app/Contents/Resources/app`;
-const registry = "https://gitlab.com/api/v4/projects/25637892/packages/generic/crimata/0.0.1/Crimata.zip";
+const app = "Crimata.app";
+const dir = `${app}/Contents/Resources/app`;
 
 const runShellCommand = (cmd) => (new Promise((resolve, reject) => {
     exec(cmd, (error, stdout, stderr) => {
@@ -12,11 +11,8 @@ const runShellCommand = (cmd) => (new Promise((resolve, reject) => {
     });
 }));
 
-// /projects/:id/packages/generic/:package_name/:package_version/:file_name?status=:status
-
-
 const signConfig = {
-    "app": name + ".app",
+    "app": app,
     "hardened-runtime": true,
     "gatekeeper-assess": false,
     "signature-flags": "library",
@@ -25,7 +21,7 @@ const signConfig = {
 };
 
 const notarizeConfig = {
-    appPath: name + ".app",
+    appPath: app,
     appleId: "gundersena@crimata.com",
     appBundleId: "com.crimata.CrimataMessenger",
     appleIdPassword: process.env["AC_PASSWORD"]
@@ -35,24 +31,18 @@ const notarizeConfig = {
 
     try 
     {
-        // console.log("Building...");
-        // await runShellCommand(`rm -rf ${dir} && mkdir ${dir} && cp -r {package.json,src,node_modules} ${dir}
-        // `);
-
-        // console.log("Cleaning...");
-        // await runShellCommand(`xattr -cr ${name}.app`);
+        console.log("Building...");
+        await runShellCommand(`rm -rf ${dir} && mkdir ${dir} && cp -r {package.json,src,node_modules} ${dir}
+        `);
 
-        // console.log("Signing...");
-        // await sign(signConfig);
+        console.log("Cleaning...");
+        await runShellCommand(`xattr -cr ${app}`);
 
-        // console.log("Notarizing...");
-        // await notarize(notarizeConfig);
+        console.log("Signing...");
+        await sign(signConfig);
 
-        // console.log("Compressing...");
-        // await runShellCommand(`zip -vr ${name}.zip ${name}.app`);
-
-        console.log("Uploading to Gitlab...");
-        await runShellCommand(`curl --header "PRIVATE-TOKEN: ${process.env["API_TOKEN"]}" --upload-file ${name}.zip "${registry}"`);
+        console.log("Notarizing...");
+        await notarize(notarizeConfig);
     }
     catch (e)
     {
@@ -60,10 +50,3 @@ const notarizeConfig = {
     }
 
 })();
-
-
-/**
- * Copy file from local to remote:
- * 
- * scp -r Electron.app gundersena@crimata-server:~/Desktop/crimata/website/assets
- */
\ No newline at end of file
-- 
2.43.0