From 099d23b568494b22e5cdcaf12d1440e6d59bf2e6 Mon Sep 17 00:00:00 2001
From: Zane Schepke <zanecschepke@gmail.com>
Date: Fri, 24 Nov 2023 12:47:21 -0500
Subject: [PATCH] update bundle id and package

---
 nym-vpn/desktop/nymvpn-packages/macos/build.sh     |  4 ++--
 .../desktop/nymvpn-packages/macos/pkg/Distribution | 14 +++++++-------
 .../Applications/upvpn.app/Contents/Info.plist     |  2 +-
 .../upvpn.app/Contents/Resources/uninstall.sh      |  4 ++--
 .../nymvpn-packages/macos/pkg/scripts/postinstall  |  4 ++--
 .../nymvpn-packages/macos/pkg/scripts/preinstall   |  2 +-
 .../desktop/nymvpn-ui/src-tauri/tauri.conf.json    |  2 +-
 7 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/nym-vpn/desktop/nymvpn-packages/macos/build.sh b/nym-vpn/desktop/nymvpn-packages/macos/build.sh
index 4a35b9eb39..400b8e0d9c 100755
--- a/nym-vpn/desktop/nymvpn-packages/macos/build.sh
+++ b/nym-vpn/desktop/nymvpn-packages/macos/build.sh
@@ -29,11 +29,11 @@ fi
 
 pkgbuild  \
     --install-location /Applications \
-    --identifier net.nymvpn.macos \
+    --identifier net.nymtech.vpn \
     --version "${VERSION}" \
     --scripts "./pkg/scripts" \
     --root "./pkg/root/Applications" \
-    ./packages/net.nymvpn.macos.pkg
+    ./packages/net.nymtech.vpn.pkg
 
 productbuild \
     --distribution "./pkg/Distribution" \
diff --git a/nym-vpn/desktop/nymvpn-packages/macos/pkg/Distribution b/nym-vpn/desktop/nymvpn-packages/macos/pkg/Distribution
index a45fd52553..4849df8e23 100644
--- a/nym-vpn/desktop/nymvpn-packages/macos/pkg/Distribution
+++ b/nym-vpn/desktop/nymvpn-packages/macos/pkg/Distribution
@@ -4,12 +4,12 @@
     <welcome file="welcome.html" mime-type="text/html"/>
     <conclusion file="conclusion.html" mime-type="text/html"/>
     <options customize="never" require-scripts="false" />
-    <pkg-ref id="net.nymvpn.macos">
+    <pkg-ref id="net.nymtech.vpn">
         <bundle-version>
-            <bundle CFBundleShortVersionString="APP_VERSION" CFBundleVersion="APP_VERSION" id="net.nymvpn.macos" path="nymvpn.net"/>
+            <bundle CFBundleShortVersionString="APP_VERSION" CFBundleVersion="APP_VERSION" id="net.nymtech.vpn" path="nymvpn.net"/>
         </bundle-version>
     </pkg-ref>
-    <product id="net.nymvpn.macos" version="APP_VERSION"/>
+    <product id="net.nymtech.vpn" version="APP_VERSION"/>
     <volume-check>
         <allowed-os-versions>
             <os-version min="10.11.0"/>
@@ -17,13 +17,13 @@
     </volume-check>
     <choices-outline>
         <line choice="default">
-            <line choice="net.nymvpn.macos"/>
+            <line choice="net.nymtech.vpn"/>
         </line>
     </choices-outline>
     <choice id="default" title="nymvpn" versStr="APP_VERSION"/>
-    <choice id="net.nymvpn.macos" title="nymvpn" visible="false">
-        <pkg-ref id="net.nymvpn.macos"/>
+    <choice id="net.nymtech.vpn" title="nymvpn" visible="false">
+        <pkg-ref id="net.nymtech.vpn"/>
     </choice>
-    <pkg-ref id="net.nymvpn.macos" version="APP_VERSION" onConclusion="none" >#net.nymvpn.macos.pkg</pkg-ref>
+    <pkg-ref id="net.nymtech.vpn" version="APP_VERSION" onConclusion="none" >#net.nymtech.vpn.pkg</pkg-ref>
     <domains enable_anywhere="false" enable_currentUserHome="false" enable_localSystem="true"/>
 </installer-gui-script>
diff --git a/nym-vpn/desktop/nymvpn-packages/macos/pkg/root/Applications/upvpn.app/Contents/Info.plist b/nym-vpn/desktop/nymvpn-packages/macos/pkg/root/Applications/upvpn.app/Contents/Info.plist
index 8d383e0984..703dc4b8d4 100644
--- a/nym-vpn/desktop/nymvpn-packages/macos/pkg/root/Applications/upvpn.app/Contents/Info.plist
+++ b/nym-vpn/desktop/nymvpn-packages/macos/pkg/root/Applications/upvpn.app/Contents/Info.plist
@@ -13,7 +13,7 @@
 	<key>CFBundleIconFile</key>
 	<string>icon.icns</string>
 	<key>CFBundleIdentifier</key>
-	<string>net.nymvpn.macos</string>
+	<string>net.nymtech.vpn</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>
diff --git a/nym-vpn/desktop/nymvpn-packages/macos/pkg/root/Applications/upvpn.app/Contents/Resources/uninstall.sh b/nym-vpn/desktop/nymvpn-packages/macos/pkg/root/Applications/upvpn.app/Contents/Resources/uninstall.sh
index fde8de90ad..cc395f8129 100755
--- a/nym-vpn/desktop/nymvpn-packages/macos/pkg/root/Applications/upvpn.app/Contents/Resources/uninstall.sh
+++ b/nym-vpn/desktop/nymvpn-packages/macos/pkg/root/Applications/upvpn.app/Contents/Resources/uninstall.sh
@@ -3,7 +3,7 @@
 set -ueo pipefail
 
 LOG_DIR="/var/log/nymvpn"
-NYMVPN_DAEMON_PLIST_PATH="/Library/LaunchDaemons/net.nymvpn.daemon.plist"
+NYMVPN_DAEMON_PLIST_PATH="/Library/LaunchDaemons/net.nymtech.daemon.plist"
 
 ask_confirmation() {
     read -p "Are you sure you want to stop and uninstall nymvpn? (y/n) "
@@ -29,7 +29,7 @@ uninstall() {
     echo "Removing files ..."
     sudo rm /usr/local/bin/nymvpn || true
     sudo rm -rf /Applications/nymvpn.net || true
-    sudo pkgutil --forget net.nymvpn.macos || true
+    sudo pkgutil --forget net.nymtech.vpn || true
     sudo rm -rf /var/log/nymvpn || true
     sudo rm -rf /etc/nymvpn || true
 }
diff --git a/nym-vpn/desktop/nymvpn-packages/macos/pkg/scripts/postinstall b/nym-vpn/desktop/nymvpn-packages/macos/pkg/scripts/postinstall
index 2b29b69461..5b10c5eff6 100755
--- a/nym-vpn/desktop/nymvpn-packages/macos/pkg/scripts/postinstall
+++ b/nym-vpn/desktop/nymvpn-packages/macos/pkg/scripts/postinstall
@@ -7,7 +7,7 @@ set -euo pipefail
 
 INSTALL_DIR="/Applications"
 LOG_DIR="/var/log/nymvpn"
-NYMVPN_DAEMON_PLIST_PATH="/Library/LaunchDaemons/net.nymvpn.daemon.plist"
+NYMVPN_DAEMON_PLIST_PATH="/Library/LaunchDaemons/net.nymtech.daemon.plist"
 
 mkdir -p $LOG_DIR
 chmod 755 $LOG_DIR
@@ -20,7 +20,7 @@ NYMVPN_DAEMON_PLIST=$(cat <<-PLIST
 <plist version="1.0">
     <dict>
         <key>Label</key>
-        <string>net.nymvpn.daemon</string>
+        <string>net.nymtech.daemon</string>
         <key>ProgramArguments</key>
         <array>
             <string>${INSTALL_DIR}/nymvpn.net/Contents/Resources/nymvpn-daemon</string>
diff --git a/nym-vpn/desktop/nymvpn-packages/macos/pkg/scripts/preinstall b/nym-vpn/desktop/nymvpn-packages/macos/pkg/scripts/preinstall
index d8f940b343..19656c6ed9 100755
--- a/nym-vpn/desktop/nymvpn-packages/macos/pkg/scripts/preinstall
+++ b/nym-vpn/desktop/nymvpn-packages/macos/pkg/scripts/preinstall
@@ -7,7 +7,7 @@ set -euo pipefail
 
 INSTALL_DIR="/Applications"
 LOG_DIR="/var/log/nymvpn"
-NYMVPN_DAEMON_PLIST_PATH="/Library/LaunchDaemons/net.nymvpn.daemon.plist"
+NYMVPN_DAEMON_PLIST_PATH="/Library/LaunchDaemons/net.nymtech.daemon.plist"
 
 mkdir -p $LOG_DIR
 chmod 755 $LOG_DIR
diff --git a/nym-vpn/desktop/nymvpn-ui/src-tauri/tauri.conf.json b/nym-vpn/desktop/nymvpn-ui/src-tauri/tauri.conf.json
index c79c59d6aa..7451539593 100644
--- a/nym-vpn/desktop/nymvpn-ui/src-tauri/tauri.conf.json
+++ b/nym-vpn/desktop/nymvpn-ui/src-tauri/tauri.conf.json
@@ -49,7 +49,7 @@
         "../../nymvpn-assets/icons/icon.icns",
         "../../nymvpn-assets/icons/icon.ico"
       ],
-      "identifier": "net.nymvpn.client",
+      "identifier": "net.nymtech.client",
       "longDescription": "",
       "macOS": {
         "entitlements": null,