From d0155bc786ae9a4e928bcab6ee86f76e5d57d1bf Mon Sep 17 00:00:00 2001
From: Reactor Scram <ReactorScram@users.noreply.github.com>
Date: Mon, 29 Apr 2024 12:34:25 -0500
Subject: [PATCH] fix(windows-client): package name should be "Firezone" not
 "firezone-client-gui" (#4814)

Closes #4813

After PR, the installer, UAC dialog, and notifications all say
"Firezone" again

<img width="494" alt="image"
src="https://github.com/firezone/firezone/assets/13400041/69a4fe0b-78fa-4945-b17f-625e68ac09db">
---
 .github/workflows/_tauri.yml                      | 2 +-
 rust/gui-client/src-tauri/tauri.windows.conf.json | 5 ++++-
 scripts/build/tauri-rename-windows.sh             | 2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/_tauri.yml b/.github/workflows/_tauri.yml
index 57bfc8785..f4696687b 100644
--- a/.github/workflows/_tauri.yml
+++ b/.github/workflows/_tauri.yml
@@ -84,7 +84,7 @@ jobs:
       - name: Sign the MSI
         if: ${{ runner.os == 'Windows' }}
         shell: bash
-        run: ../../scripts/build/sign.sh ../target/release/bundle/msi/firezone-client-gui_${{ env.VERSION }}_x64_en-US.msi
+        run: ../../scripts/build/sign.sh ../target/release/bundle/msi/Firezone_${{ env.VERSION }}_x64_en-US.msi
       - name: Rename artifacts and compute SHA256
         shell: bash
         run: ${{ matrix.rename-script }}
diff --git a/rust/gui-client/src-tauri/tauri.windows.conf.json b/rust/gui-client/src-tauri/tauri.windows.conf.json
index f1098c400..b7c2f19f7 100644
--- a/rust/gui-client/src-tauri/tauri.windows.conf.json
+++ b/rust/gui-client/src-tauri/tauri.windows.conf.json
@@ -1,5 +1,8 @@
 {
   "build": {
-    "beforeBundleCommand": "bash -c '../../scripts/build/sign.sh ../target/release/firezone-client-gui.exe'"
+    "beforeBundleCommand": "bash -c '../../scripts/build/sign.sh ../target/release/Firezone.exe'"
+  },
+  "package": {
+    "productName": "Firezone"
   }
 }
diff --git a/scripts/build/tauri-rename-windows.sh b/scripts/build/tauri-rename-windows.sh
index 32f5f1f7e..e410ee751 100755
--- a/scripts/build/tauri-rename-windows.sh
+++ b/scripts/build/tauri-rename-windows.sh
@@ -6,7 +6,7 @@ ls ../target/release ../target/release/bundle/msi
 
 # Used for release artifact
 # In release mode the name comes from tauri.conf.json
-cp ../target/release/firezone-client-gui.exe "$BINARY_DEST_PATH.exe"
+cp ../target/release/Firezone.exe "$BINARY_DEST_PATH.exe"
 cp ../target/release/bundle/msi/*.msi "$BINARY_DEST_PATH.msi"
 cp ../target/release/firezone_gui_client.pdb "$BINARY_DEST_PATH.pdb"