Avoid consider PATH updated when the export is commented in the shellrc #12043
+6
−1
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| @@ -73,7 +73,7 @@ pub(crate) async fn update_shell(printer: Printer) -> Result<ExitStatus> { | |||
| // Search for the command in the file, to avoid redundant updates. | |||
| match fs_err::tokio::read_to_string(&file).await { | |||
| Ok(contents) => { | |||
| if contents.contains(&command) { | |||
| if contents.lines().any(|line| line.trim() == command.trim()) { | |||
There was a problem hiding this comment.
Could we instead skip lines that start with #?
charliermarsh
approved these changes
Mar 8, 2025
charliermarsh
force-pushed
the
joncholas/improve-update-shell
branch
from
b53977e to
d8e4acf
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Summary
The way the
tool update-shellchecks if the command to export the PATH exists or not in the RC files is a blind search, and therefore if finds the command inside comments.example with .zshenv
This content
Generates the following msg
With this change, that content won't be considered as configured and the following will be added
This will make the
update-shellmore reliableTest Plan
I tested with and without the change with commented export in zsh in mac. Tested running
cargo run -- tool update-shell