holm/nushell
1
1
Fork 0
forked from extern/nushell
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix tests

Browse Source
This commit is contained in:
Jonathan Turner 2019-08-22 16:23:57 +12:00
parent 303d27d4b6
commit 87930ba35a
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/shell/filesystem_shell.rs
View File

@ -831,13 +831,7 @@ impl Shell for FilesystemShell {
) -> Result<VecDeque<ReturnValue>, ShellError> {
let name_span = name;
let mut path = PathBuf::from(path);
path.push(&target.item);
let file = path.to_string_lossy();
if file == "." || file == ".." {
if target.item.to_str() == Some(".") || target.item.to_str() == Some("..") {
return Err(ShellError::labeled_error(
"Remove aborted. \".\" or \"..\" may not be removed.",
"Remove aborted. \".\" or \"..\" may not be removed.",
@ -845,6 +839,12 @@ impl Shell for FilesystemShell {
));
}
let mut path = PathBuf::from(path);
path.push(&target.item);
let file = path.to_string_lossy();
let entries: Vec<_> = match glob::glob(&path.to_string_lossy()) {
Ok(files) => files.collect(),
Err(_) => {