mirror of
https://github.com/nushell/nushell.git
synced 2025-02-18 03:21:05 +01:00
Fix '/' and '..' not being valid mv targets (#1519)
* Fix '/' and '..' not being valid mv targets If `/` or `../` is specified as the destination for `mv`, it will fail with an error message saying it's not a valid destination. This fixes it to account for the fact that `Path::file_name` return `None` when the file name evaluates to `/` or `..`. It will only take the slow(er) path if `Path::file_name` returns `None` in its initial check. Fixes #1291 * Add test
This commit is contained in:
parent
f030ab3f12
commit
81a48d6d0e
@ -631,11 +631,27 @@ impl Shell for FilesystemShell {
|
|||||||
match destination.file_name() {
|
match destination.file_name() {
|
||||||
Some(name) => PathBuf::from(name),
|
Some(name) => PathBuf::from(name),
|
||||||
None => {
|
None => {
|
||||||
|
let name_maybe =
|
||||||
|
destination.components().next_back().and_then(
|
||||||
|
|component| match component {
|
||||||
|
Component::RootDir => Some(PathBuf::from("/")),
|
||||||
|
Component::ParentDir => destination
|
||||||
|
.parent()
|
||||||
|
.and_then(|parent| parent.file_name())
|
||||||
|
.map(PathBuf::from),
|
||||||
|
_ => None,
|
||||||
|
},
|
||||||
|
);
|
||||||
|
|
||||||
|
if let Some(name) = name_maybe {
|
||||||
|
name
|
||||||
|
} else {
|
||||||
return Err(ShellError::labeled_error(
|
return Err(ShellError::labeled_error(
|
||||||
"Rename aborted. Not a valid destination",
|
"Rename aborted. Not a valid destination",
|
||||||
"not a valid destination",
|
"not a valid destination",
|
||||||
dst.tag,
|
dst.tag,
|
||||||
))
|
));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
@ -230,3 +230,23 @@ fn errors_if_source_doesnt_exist() {
|
|||||||
assert!(actual.contains("Invalid File or Pattern"));
|
assert!(actual.contains("Invalid File or Pattern"));
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn does_not_error_on_relative_parent_path() {
|
||||||
|
Playground::setup("mv_test_11", |dirs, sandbox| {
|
||||||
|
sandbox
|
||||||
|
.mkdir("first")
|
||||||
|
.with_files(vec![EmptyFile("first/william_hartnell.txt")]);
|
||||||
|
|
||||||
|
let original = dirs.test().join("first/william_hartnell.txt");
|
||||||
|
let expected = dirs.test().join("william_hartnell.txt");
|
||||||
|
|
||||||
|
nu!(
|
||||||
|
cwd: dirs.test().join("first"),
|
||||||
|
"mv william_hartnell.txt ./.."
|
||||||
|
);
|
||||||
|
|
||||||
|
assert!(!original.exists());
|
||||||
|
assert!(expected.exists());
|
||||||
|
})
|
||||||
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user