From 9c0f7a37955d980144766dee9a704b29a888e300 Mon Sep 17 00:00:00 2001
From: filip mertens <filip.mertens@ethereum.org>
Date: Thu, 7 Mar 2024 08:00:55 +0100
Subject: [PATCH] cleanup

---
 .circleci/config.yml                          |  1 +
 .../{notarize.js => aftersign.js}             |  2 +-
 apps/remixdesktop/notarize.sh                 | 26 -------------------
 apps/remixdesktop/package.json                |  2 +-
 apps/remixdesktop/src/plugins/appUpdater.ts   |  1 -
 5 files changed, 3 insertions(+), 29 deletions(-)
 rename apps/remixdesktop/{notarize.js => aftersign.js} (95%)
 delete mode 100644 apps/remixdesktop/notarize.sh

diff --git a/.circleci/config.yml b/.circleci/config.yml
index fe1a849fbd..1a021014dc 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -610,6 +610,7 @@ workflows:
           requires:
             - build-remixdesktop-mac
             - build-remixdesktop-linux
+            - build-remixdesktop-windows
       - build-plugin:
           matrix:
             parameters:
diff --git a/apps/remixdesktop/notarize.js b/apps/remixdesktop/aftersign.js
similarity index 95%
rename from apps/remixdesktop/notarize.js
rename to apps/remixdesktop/aftersign.js
index 570b16f0f2..97d8305848 100644
--- a/apps/remixdesktop/notarize.js
+++ b/apps/remixdesktop/aftersign.js
@@ -7,7 +7,7 @@ exports.default = async function notarizing(context) {
 
   console.log('NOTARIZING');
 
-  if (electronPlatformName !== 'darwin') {
+  if (electronPlatformName !== 'darwin' || !process.env.CIRCLE_BRANCH) {
     return;
   }
 
diff --git a/apps/remixdesktop/notarize.sh b/apps/remixdesktop/notarize.sh
deleted file mode 100644
index 549f103d5c..0000000000
--- a/apps/remixdesktop/notarize.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/bash
-
-echo "Argument 1: $1"
-echo "Argument 2: $2"
-
-exit 0
-
-xcrun notarytool store-credentials "notarytool-password" \
---apple-id ${APPLE_ID} \
---team-id ${APPLE_TEAM_ID} \
---password ${APPLE_ID_PASSWORD}
-# Assuming your app is packaged as a dmg or zip for notarization
-xcrun notarytool submit "$1" \
---keychain-profile "notarytool-password" \
---wait
-
-# Assuming your app is packaged as a dmg or zip for notarization
-xcrun notarytool submit "$2" \
---keychain-profile "notarytool-password" \
---wait
-
-xcrun stapler staple "$1"
-xcrun stapler staple "$2"
-
-spctl -a -t open -vvv --context context:primary-signature "$1"
-spctl -a -t open -vvv --context context:primary-signature "$2"
\ No newline at end of file
diff --git a/apps/remixdesktop/package.json b/apps/remixdesktop/package.json
index b249bda5f3..e5efc872e0 100644
--- a/apps/remixdesktop/package.json
+++ b/apps/remixdesktop/package.json
@@ -70,7 +70,7 @@
     "files": [
       "build/**/*"
     ],
-    "afterSign": "notarize.js",
+    "afterSign": "aftersign.js",
     "afterAllArtifactBuild": "afterbuild.js",
     "publish": [
       {
diff --git a/apps/remixdesktop/src/plugins/appUpdater.ts b/apps/remixdesktop/src/plugins/appUpdater.ts
index 1219d5a891..c75ac8e354 100644
--- a/apps/remixdesktop/src/plugins/appUpdater.ts
+++ b/apps/remixdesktop/src/plugins/appUpdater.ts
@@ -107,7 +107,6 @@ class AppUpdaterPluginClient extends ElectronBasePluginClient {
 
   async install(): Promise<void> {
     autoUpdater.quitAndInstall()
-    app.exit()
   }
 
   async checkForUpdates(): Promise<void> {