Skip to content

Commit

Permalink
zed.desktop.in: Don't hardcode executable name due to binary conflicts (
Browse files Browse the repository at this point in the history
zed-industries#12951)

> * There are a couple of other `zed` binaries that may be present on
linux systems
    ([1](https://openzfs.github.io/openzfs-docs/man/v2.2/8/zed.8.html),
[2](https://zed.brimdata.io/docs/commands/zed)). If you want to rename
our CLI
binary because of these issues, we suggest `zedit`, `zeditor`, or
`zed-cli`.

Due to aformentioned issue don't hardcode the executable name in the
.desktop file so envsubst can change it in accordance with the
distributor's requirement.

Resolves zed-industries#12290.

Release Notes:

- N/A
  • Loading branch information
joebonrichie authored and fallenwood committed Jun 18, 2024
1 parent de83594 commit 6872198
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 2 deletions.
4 changes: 2 additions & 2 deletions crates/zed/resources/zed.desktop.in
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ Type=Application
Name=$APP_NAME
GenericName=Text Editor
Comment=A high-performance, multiplayer code editor.
TryExec=zed
TryExec=$APP_CLI
StartupNotify=$DO_STARTUP_NOTIFY
Exec=zed $APP_ARGS
Exec=$APP_CLI $APP_ARGS
Icon=$APP_ICON
Categories=Utility;TextEditor;Development;IDE;
Keywords=zed;
Expand Down
1 change: 1 addition & 0 deletions script/bundle-linux
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,7 @@ cp "crates/zed/resources/[email protected]" "${zed_dir}/share/icons/hicolor

# .desktop
export DO_STARTUP_NOTIFY="true"
export APP_CLI="zed"
export APP_ICON="zed"
if [[ "$channel" == "preview" ]]; then
export APP_NAME="Zed Preview"
Expand Down
1 change: 1 addition & 0 deletions script/flatpak/bundle-flatpak
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ channel=$(<crates/zed/RELEASE_CHANNEL)

export CHANNEL="$channel"
export ARCHIVE="$archive"
export APP_CLI = "zed"
if [[ "$channel" == "dev" ]]; then
export APP_ID="dev.zed.Zed-Dev"
export APP_NAME="Zed Devel"
Expand Down

0 comments on commit 6872198

Please sign in to comment.