From 2e33b57d112e3df07cc52b94783ce920d2cc09ba Mon Sep 17 00:00:00 2001
From: Jakub Jirutka <jakub@jirutka.cz>
Date: Thu, 6 Jun 2024 00:21:35 +0200
Subject: [PATCH] testing/zed: rename zed binary to zed-editor to avoid clash
 with ZFS

---
 testing/zed/APKBUILD          | 5 +++--
 testing/zed/zed-desktop.patch | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/testing/zed/APKBUILD b/testing/zed/APKBUILD
index 6b21f24444f..05c4654c0fd 100644
--- a/testing/zed/APKBUILD
+++ b/testing/zed/APKBUILD
@@ -88,7 +88,8 @@ check() {
 
 package() {
 	install -D -m755 target/release/zed "$pkgdir"/usr/libexec/zed-editor
-	install -D -m755 target/release/cli "$pkgdir"/usr/bin/zed
+	# Upstream recommends name "zed" but that's already taken by ZFS Event Daemon.
+	install -D -m755 target/release/cli "$pkgdir"/usr/bin/zed-editor
 
 	install -D -m644 crates/zed/resources/zed.desktop.in "$pkgdir"/usr/share/applications/zed.desktop
 	install -D -m644 crates/zed/resources/app-icon.png "$pkgdir"/usr/share/icons/hicolor/512x512/apps/zed.png
@@ -104,7 +105,7 @@ e05bd7921f5b611d7ed7857b4a613b2b01b152794d5a7e6bcc4c5767e9bd10937be29ace0a4af154
 54a17784e428efc1564298f9e2a79e6c78386a4af47ea8c5d6c1df3543305258937b654d40841e281e9abadeb0f11ab6d5b1cc463d0d5770eceeace0819f833a  system-sqlite.patch
 4a023dcdceb5d4511adda570d25690e76cc16e90dcffd57095fdd9f6acccfbd9d3efcf3032441fb632257f2435c64bb93cc6cb3b8b3771be9cd25abe1e67ecf6  dont-download-node.patch
 c6aab3cb834a3e345324632499599f15dd2856f3d5fbffcc280fd31cbcb76c5f5fb0efe74cb55e53568058100b287101a558e53f88b7b81beb1f8136e61731c5  dont-download-supermaven.patch
-df3123daaee2d3fcfd767cec17e5f2400de5e81cf21c4368fe4aff89195b0646b2ebad0d9ef0407cafb14894bec4927b92ae0f4afea685a25b8ce40d02088c22  zed-desktop.patch
+be0d02d3b994965402bd5e84efc8c06f8a0f98c88fb091d0f514d26bff268d0a02dd79982a9dfb60cc8b656d59c474a53be5d26eadb8dfd306676b1aa67e3441  zed-desktop.patch
 50d6b709441b7943799e208fef992d2b2db38ee15a2ef1608894f6b8b1fec7c83c437f6f9441b6bc79d0a1b2b094911d892964398b4597a98b11226922ad0285  defaults.patch
 69586a09cbb9ba560414ea020260e535ef25ff8d194266892d4f27c3744f00e8704a4947c898631503d0133886b31d30e06dfc12b78c4147340baf7b88d7ba04  cargo.lock.patch
 "
diff --git a/testing/zed/zed-desktop.patch b/testing/zed/zed-desktop.patch
index 312bca6c1d4..50a7e9090c7 100644
--- a/testing/zed/zed-desktop.patch
+++ b/testing/zed/zed-desktop.patch
@@ -13,7 +13,7 @@
 -Exec=zed $APP_ARGS
 -Icon=$APP_ICON
 +StartupNotify=true
-+Exec=/usr/bin/zed
++Exec=/usr/bin/zed-editor
 +Icon=zed
  Categories=Utility;TextEditor;Development;IDE;
  Keywords=zed;