From bbf536be85b266c2e780aa22ed3325adc311dd63 Mon Sep 17 00:00:00 2001
From: Pascal Fischer <pascal@netbird.io>
Date: Tue, 6 Jun 2023 00:04:57 +0200
Subject: [PATCH] moved service uninstall and app close into postinstall

---
 release_files/darwin_pkg/postinstall | 9 +++++++--
 release_files/darwin_pkg/preinstall  | 4 ----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/release_files/darwin_pkg/postinstall b/release_files/darwin_pkg/postinstall
index 503a2a2b5..b1e78064b 100755
--- a/release_files/darwin_pkg/postinstall
+++ b/release_files/darwin_pkg/postinstall
@@ -17,6 +17,8 @@ mkdir -p /usr/local/bin/
         exit 1
     fi
 
+    osascript -e 'quit app "Netbird"' || true
+
     ln -s $APP/Contents/MacOS/netbird $AGENT
     if test -f $AGENT; then
         echo "NetBird binary linked successfully."
@@ -25,8 +27,11 @@ mkdir -p /usr/local/bin/
         exit 1
     fi
 
-    $AGENT service install
-    $AGENT service start
+    $AGENT service stop || true
+    $AGENT service uninstall || true
+
+    $AGENT service install || true
+    $AGENT service start || true
 
     open $APP
 
diff --git a/release_files/darwin_pkg/preinstall b/release_files/darwin_pkg/preinstall
index 80b8dcd97..83f571ac6 100755
--- a/release_files/darwin_pkg/preinstall
+++ b/release_files/darwin_pkg/preinstall
@@ -5,10 +5,6 @@ LOG_FILE=/var/log/netbird/client_install.log
 mkdir -p /var/log/netbird/
 
 {
-    netbird service stop || true
-    netbird service uninstall || true
-    pkill -f netbird || true
-
     echo "Preinstall complete"
     exit 0 # all good
 } &> $LOG_FILE