From 1081ba7a62ed67ba7dae0e2304842e82a589f25e Mon Sep 17 00:00:00 2001
From: Kirill Bulatov <kirill@zed.dev>
Date: Fri, 8 Mar 2024 13:37:10 +0200
Subject: [PATCH] Adjust to newer logic from zed-industries/cargo-bundle
 (#9058)

Zed uses a fork of cargo-bundle, that got upstream changes and
https://github.com/zed-industries/cargo-bundle/commit/9e185bd44d968d8039192220603494555afdbb4f
into the deploy branch.

Remove a TODO and adjust the script to the new packaging logic.


Release Notes:

- N/A
---
 script/bundle-linux | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/script/bundle-linux b/script/bundle-linux
index 6f964b7a0b..46afe1274d 100755
--- a/script/bundle-linux
+++ b/script/bundle-linux
@@ -54,10 +54,6 @@ echo "Compiling zed binaries"
 cargo build ${build_flag} --package ${zed_crate} --package cli
 
 echo "Creating application bundle"
-# TODO linux
-# Here, hacks to make `cargo bundle` run work, but macOS does not need these
-# Most probably, needs https://github.com/zed-industries/cargo-bundle/commit/9e185bd44d968d8039192220603494555afdbb4f from the upstream.
-cp "target/${target_dir}/Zed" "target/${target_dir}/zed"
 pushd crates/${zed_crate}
     channel=$(<RELEASE_CHANNEL)
     cp Cargo.toml Cargo.toml.backup
@@ -96,7 +92,7 @@ pushd target/
     dpkg-deb -x "${bundle_path}" bundle/
     dpkg-deb --control "${bundle_path}" bundle/DEBIAN
     mkdir -p bundle/usr/local/bin/
-    mv bundle/usr/bin/zed "bundle/usr/local/bin/zed-$channel"
+    mv bundle/usr/bin/Zed "bundle/usr/local/bin/zed-$channel"
     cp "${target_dir}/cli" "bundle/usr/local/bin/cli-$channel"
     ln -s "/usr/local/bin/cli-$channel" "bundle/usr/local/bin/zed"
     rm -rf bundle/usr/bin/