Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

zed.desktop.in: Don't hardcode executable name due to binary conflicts #12951

Merged

Conversation

joebonrichie
Copy link
Contributor

@joebonrichie joebonrichie commented Jun 12, 2024

  • There are a couple of other zed binaries that may be present on linux systems
    (1,
    2). 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 #12290.

Release Notes:

  • N/A

> * 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.
Copy link

cla-bot bot commented Jun 12, 2024

We require contributors to sign our Contributor License Agreement, and we don't have @joebonrichie on file. You can sign our CLA at https://zed.dev/cla. Once you've signed, post a comment here that says '@cla-bot check'.

@joebonrichie
Copy link
Contributor Author

joebonrichie commented Jun 12, 2024

@cla-bot check

@cla-bot cla-bot bot added the cla-signed The user has signed the Contributor License Agreement label Jun 12, 2024
Copy link

cla-bot bot commented Jun 12, 2024

The cla-bot has been summoned, and re-checked this pull request!

@mikayla-maki mikayla-maki merged commit f780504 into zed-industries:main Jun 13, 2024
9 checks passed
@joebonrichie joebonrichie deleted the no-hardcodey-desktop-exec branch June 13, 2024 11:28
@someone13574
Copy link
Contributor

someone13574 commented Jun 13, 2024

Can’t $APP_ARGS be removed now?

Edit: Nvm, we don't want to pass args to TryExec

maxdeviant pushed a commit that referenced this pull request Jun 14, 2024
Fixes a problem where the env variable was being set in the wrong spot
in #12951

Release Notes:

- N/A
ming900518 pushed a commit to ming900518/zed that referenced this pull request Jun 14, 2024
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
ming900518 pushed a commit to ming900518/zed that referenced this pull request Jun 14, 2024
Fixes a problem where the env variable was being set in the wrong spot
in zed-industries#12951

Release Notes:

- N/A
fallenwood pushed a commit to fallenwood/zed that referenced this pull request Jun 18, 2024
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
fallenwood pushed a commit to fallenwood/zed that referenced this pull request Jun 18, 2024
Fixes a problem where the env variable was being set in the wrong spot
in zed-industries#12951

Release Notes:

- N/A
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cla-signed The user has signed the Contributor License Agreement
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Name confilict with zfs-utils
3 participants