Skip to content

Avoid consider PATH updated when the export is commented in the shellrc #12043

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.

Sign up for GitHub

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

Merged
merged 3 commits into from
Mar 8, 2025
Merged

Avoid consider PATH updated when the export is commented in the shellrc #12043

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3db8f04
Avoid consider PATH updated when the export is commented in the shell
JonCholas Mar 7, 2025
0c15118
Merge branch 'main' into joncholas/improve-update-shell
charliermarsh Mar 8, 2025
d8e4acf
Skip comments
charliermarsh Mar 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion crates/uv/src/commands/tool/update_shell.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,12 @@ 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()
.map(str::trim)
.filter(|line| !line.starts_with('#'))
.any(|line| line.contains(&command))
{
debug!(
"Skipping already-updated configuration file: {}",
file.simplified_display()
Expand Down
Loading