zed-industries/zed
1
1
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2024-09-19 18:41:56 +03:00
Code Issues Packages Projects Releases Wiki Activity

Adjust to newer logic from zed-industries/cargo-bundle (#9058)

Browse Source 
Zed uses a fork of cargo-bundle, that got upstream changes and
9e185bd44d
into the deploy branch.

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


Release Notes:

- N/A
This commit is contained in:
Kirill Bulatov 2024-03-08 13:37:10 +02:00 committed by GitHub
parent ed8aa6d200
commit 1081ba7a62
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
script/bundle-linux
View File

@ -54,10 +54,6 @@ echo "Compiling zed binaries"
cargo build ${build_flag} --package ${zed_crate} --package cli cargo build ${build_flag} --package ${zed_crate} --package cli
echo "Creating application bundle" 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} pushd crates/${zed_crate}
channel=$(<RELEASE_CHANNEL) channel=$(<RELEASE_CHANNEL)
cp Cargo.toml Cargo.toml.backup cp Cargo.toml Cargo.toml.backup
@ -96,7 +92,7 @@ pushd target/
dpkg-deb -x "${bundle_path}" bundle/ dpkg-deb -x "${bundle_path}" bundle/
dpkg-deb --control "${bundle_path}" bundle/DEBIAN dpkg-deb --control "${bundle_path}" bundle/DEBIAN
mkdir -p bundle/usr/local/bin/ 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" cp "${target_dir}/cli" "bundle/usr/local/bin/cli-$channel"
ln -s "/usr/local/bin/cli-$channel" "bundle/usr/local/bin/zed" ln -s "/usr/local/bin/cli-$channel" "bundle/usr/local/bin/zed"
rm -rf bundle/usr/bin/ rm -rf bundle/usr/bin/