mirrors/uv
1
0
Fork 0
mirror of https://github.com/astral-sh/uv.git synced 2025-10-02 23:04:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Expand tildes when matching against PATH (#6829)

Browse source 
## Summary

Closes https://github.com/astral-sh/uv/issues/6802.
This commit is contained in:
Charlie Marsh 2024-08-29 15:50:09 -04:00 • committed by GitHub
parent 0b16d10b27
commit 0ce6d75752
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 17 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
crates/uv-shell/Cargo.toml
View file

@ -11,8 +11,8 @@ workspace = true
uv-fs = { workspace = true } uv-fs = { workspace = true }
anyhow = { workspace = true } anyhow = { workspace = true }
home = { workspace = true } home = { workspace = true }
same-file = { workspace = true } same-file = { workspace = true }
tracing = { workspace = true } tracing = { workspace = true }
[target.'cfg(windows)'.dependencies] [target.'cfg(windows)'.dependencies]

15
crates/uv-shell/src/lib.rs
View file

@ -171,10 +171,25 @@ impl Shell {
/// Returns `true` if the given path is on the `PATH` in this shell. /// Returns `true` if the given path is on the `PATH` in this shell.
pub fn contains_path(path: &Path) -> bool { pub fn contains_path(path: &Path) -> bool {
let home_dir = home::home_dir();
std::env::var_os("PATH") std::env::var_os("PATH")
.as_ref() .as_ref()
.iter() .iter()
.flat_map(std::env::split_paths) .flat_map(std::env::split_paths)
.map(|path| {
// If the first component is `~`, expand to the home directory.
if let Some(home_dir) = home_dir.as_ref() {
if path
.components()
.next()
.map(std::path::Component::as_os_str)
== Some("~".as_ref())
{
return home_dir.join(path.components().skip(1).collect::<PathBuf>());
}
}
path
})
.any(|p| same_file::is_same_file(path, p).unwrap_or(false)) .any(|p| same_file::is_same_file(path, p).unwrap_or(false))
} }