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

make ls works better with glob (#5691)

Browse Source 
* fix glob behavior

* fix doc
This commit is contained in:
WindSoilder
2022-05-31 08:13:27 +08:00
committed by GitHub
parent f5519e2a09
commit 0769e9b750
9 changed files with 79 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
crates/nu-engine/src/glob_from.rs
View File

@ -2,6 +2,7 @@
use std::os::unix::fs::PermissionsExt;
use std::path::{Component, Path, PathBuf};
use nu_glob::MatchOptions;
use nu_path::{canonicalize_with, expand_path_with};
use nu_protocol::{ShellError, Span, Spanned};
@ -17,6 +18,7 @@ pub fn glob_from(
pattern: &Spanned<String>,
cwd: &Path,
span: Span,
options: Option<MatchOptions>,
) -> Result<
(
Option<PathBuf>,
@ -82,8 +84,9 @@ pub fn glob_from(
};
let pattern = pattern.to_string_lossy().to_string();
let glob_options = options.unwrap_or_else(MatchOptions::new);
let glob = nu_glob::glob(&pattern).map_err(|err| {
let glob = nu_glob::glob_with(&pattern, glob_options).map_err(|err| {
nu_protocol::ShellError::GenericError(
"Error extracting glob pattern".into(),
err.to_string(),