extern/nushell
1
0
Fork 1
mirror of https://github.com/nushell/nushell.git synced 2025-04-09 21:28:55 +02:00
Code Issues Packages Projects Releases Wiki Activity

Treat ls for absolute paths as-is (#4513)

Browse Source 
* Absolute paths in ls are treated as-in

* Better fix
This commit is contained in:
JT 2022-02-17 12:49:20 -05:00 committed by GitHub
parent f5f9d56c37
commit 393cb7ca6f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
crates/nu-command/src/filesystem/ls.rs
View File

@ -71,7 +71,7 @@ impl Command for Ls {
let cwd = current_dir(engine_state, stack)?; let cwd = current_dir(engine_state, stack)?;
let pattern_arg = call.opt::<Spanned<String>>(engine_state, stack, 0)?; let pattern_arg = call.opt::<Spanned<String>>(engine_state, stack, 0)?;
let (path, p_tag) = match pattern_arg { let (path, p_tag, absolute_path) = match pattern_arg {
Some(p) => { Some(p) => {
let p_tag = p.span; let p_tag = p.span;
let mut p = PathBuf::from(p.item); let mut p = PathBuf::from(p.item);
@ -101,13 +101,14 @@ impl Command for Ls {
} }
p.push("*"); p.push("*");
} }
(p, p_tag) let absolute_path = p.is_absolute();
(p, p_tag, absolute_path)
} }
None => { None => {
if is_empty_dir(current_dir(engine_state, stack)?) { if is_empty_dir(current_dir(engine_state, stack)?) {
return Ok(Value::nothing(call_span).into_pipeline_data()); return Ok(Value::nothing(call_span).into_pipeline_data());
} else { } else {
(PathBuf::from("./*"), call_span) (PathBuf::from("./*"), call_span, false)
} }
} }
}; };
@ -151,7 +152,7 @@ impl Command for Ls {
let display_name = if short_names { let display_name = if short_names {
path.file_name().map(|os| os.to_string_lossy().to_string()) path.file_name().map(|os| os.to_string_lossy().to_string())
} else if full_paths { } else if full_paths || absolute_path {
Some(path.to_string_lossy().to_string()) Some(path.to_string_lossy().to_string())
} else if let Some(prefix) = &prefix { } else if let Some(prefix) = &prefix {
if let Ok(remainder) = path.strip_prefix(&prefix) { if let Ok(remainder) = path.strip_prefix(&prefix) {