From 285f68119100fbfaee9a9fc108aa115f39bcbbdd Mon Sep 17 00:00:00 2001
From: Mattias Granlund <mtsgrd@gmail.com>
Date: Tue, 29 Oct 2024 13:48:50 +0100
Subject: [PATCH] Fix: merge duplicate windows keys in tauri.conf.*.json

---
 .../gitbutler-tauri/tauri.conf.nightly.json   | 26 ++++++-------------
 .../gitbutler-tauri/tauri.conf.release.json   | 26 ++++++-------------
 2 files changed, 16 insertions(+), 36 deletions(-)

diff --git a/crates/gitbutler-tauri/tauri.conf.nightly.json b/crates/gitbutler-tauri/tauri.conf.nightly.json
index ad94d82c1..2c505dfe2 100644
--- a/crates/gitbutler-tauri/tauri.conf.nightly.json
+++ b/crates/gitbutler-tauri/tauri.conf.nightly.json
@@ -15,28 +15,18 @@
 				"icons/icon.icns",
 				"icons/icon.ico"
 			],
-			"externalBin": [
-				"gitbutler-git-setsid",
-				"gitbutler-git-askpass"
-			],
-			"windows": {
-				"certificateThumbprint": null
-			},
-			"rpm": {
-				"depends": [
-					"webkit2gtk4.0-devel"
-				]
-			},
-			"deb": {
-				"depends": [
-					"libwebkit2gtk-4.0-dev",
-					"libgtk-3-dev"
-				]
-			},
+			"externalBin": ["gitbutler-git-setsid", "gitbutler-git-askpass"],
 			"windows": {
+				"certificateThumbprint": null,
 				"wix": {
 					"template": "templates/installer.wxs"
 				}
+			},
+			"rpm": {
+				"depends": ["webkit2gtk4.0-devel"]
+			},
+			"deb": {
+				"depends": ["libwebkit2gtk-4.0-dev", "libgtk-3-dev"]
 			}
 		},
 		"security": {
diff --git a/crates/gitbutler-tauri/tauri.conf.release.json b/crates/gitbutler-tauri/tauri.conf.release.json
index 199cfed6e..73e5fa1eb 100644
--- a/crates/gitbutler-tauri/tauri.conf.release.json
+++ b/crates/gitbutler-tauri/tauri.conf.release.json
@@ -15,28 +15,18 @@
 				"icons/icon.icns",
 				"icons/icon.ico"
 			],
-			"externalBin": [
-				"gitbutler-git-setsid",
-				"gitbutler-git-askpass"
-			],
-			"windows": {
-				"certificateThumbprint": null
-			},
-			"rpm": {
-				"depends": [
-					"webkit2gtk4.0-devel"
-				]
-			},
-			"deb": {
-				"depends": [
-					"libwebkit2gtk-4.0-dev",
-					"libgtk-3-dev"
-				]
-			},
+			"externalBin": ["gitbutler-git-setsid", "gitbutler-git-askpass"],
 			"windows": {
+				"certificateThumbprint": null,
 				"wix": {
 					"template": "templates/installer.wxs"
 				}
+			},
+			"rpm": {
+				"depends": ["webkit2gtk4.0-devel"]
+			},
+			"deb": {
+				"depends": ["libwebkit2gtk-4.0-dev", "libgtk-3-dev"]
 			}
 		},
 		"security": {