Mirrors/nushell
2
0
Fork 0
mirror of https://github.com/nushell/nushell synced 2025-01-15 22:54:16 +00:00
Code Issues Projects Releases Packages Wiki Activity

"#194 Added trash switch checked before normal rm command action"

Browse source
This commit is contained in:
jdvr 2019-10-19 12:25:48 +02:00
parent fc1301c92d
commit 74dddc880d
1 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/shell/filesystem_shell.rs
View file

@ -944,16 +944,14 @@ impl Shell for FilesystemShell {
)); ));
} }
if path.is_dir() {
std::fs::remove_dir_all(&path)?;
} else if path.is_file() {
if trash.item { if trash.item {
SendToTrash::remove(path).unwrap(); SendToTrash::remove(path).unwrap();
} else { } else if path.is_dir() {
std::fs::remove_dir_all(&path)?;
} else if path.is_file() {
std::fs::remove_file(&path)?; std::fs::remove_file(&path)?;
} }
} }
}
Err(e) => { Err(e) => {
return Err(ShellError::labeled_error( return Err(ShellError::labeled_error(
format!("Remove aborted. {:}", e.to_string()), format!("Remove aborted. {:}", e.to_string()),