Mirrors/nushell
2
0
Fork 0
mirror of https://github.com/nushell/nushell synced 2024-12-27 21:43:09 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix #3899, make mv and rm to be quiet by default (#5501)

Browse source
This commit is contained in:
Justin Ma 2022-05-10 21:00:27 +08:00 committed by GitHub
parent 8ffffe9bcc
commit 7e5e9c28dd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
crates/nu-command/src/filesystem/mv.rs
View file

@ -45,7 +45,11 @@ impl Command for Mv {
SyntaxShape::Filepath,
"the location to move files/directories to",
)
.switch("quiet", "suppress output showing files moved", Some('q'))
.switch(
"verbose",
"make mv to be verbose, showing files been moved.",
Some('v'),
)
// .switch("interactive", "ask user to confirm action", Some('i'))
// .switch("force", "suppress error when no file", Some('f'))
.category(Category::FileSystem)
@ -61,7 +65,7 @@ impl Command for Mv {
// TODO: handle invalid directory or insufficient permissions when moving
let spanned_source: Spanned<String> = call.req(engine_state, stack, 0)?;
let spanned_destination: Spanned<String> = call.req(engine_state, stack, 1)?;
let quiet = call.has_flag("quiet");
let verbose = call.has_flag("verbose");
// let interactive = call.has_flag("interactive");
// let force = call.has_flag("force");
@ -148,15 +152,15 @@ impl Command for Mv {
);
if let Err(error) = result {
Some(Value::Error { error })
} else if quiet {
None
} else {
} else if verbose {
let val = format!(
"moved {:} to {:}",
entry.to_string_lossy(),
destination.to_string_lossy()
);
Some(Value::String { val, span })
} else {
None
}
})
.into_pipeline_data(ctrlc))

14
crates/nu-command/src/filesystem/rm.rs
View file

@ -62,7 +62,11 @@ impl Command for Rm {
);
sig.switch("recursive", "delete subdirectories recursively", Some('r'))
.switch("force", "suppress error when no file", Some('f'))
.switch("quiet", "suppress output showing files deleted", Some('q'))
.switch(
"verbose",
"make rm to be verbose, showing files been deleted",
Some('v'),
)
// .switch("interactive", "ask user to confirm action", Some('i'))
.rest(
"rest",
@ -129,7 +133,7 @@ fn rm(
let permanent = call.has_flag("permanent");
let recursive = call.has_flag("recursive");
let force = call.has_flag("force");
let quiet = call.has_flag("quiet");
let verbose = call.has_flag("verbose");
// let interactive = call.has_flag("interactive");
let ctrlc = engine_state.ctrlc.clone();
@ -327,11 +331,11 @@ fn rm(
Vec::new(),
),
}
} else if quiet {
Value::Nothing { span }
} else {
} else if verbose {
let val = format!("deleted {:}", f.to_string_lossy());
Value::String { val, span }
} else {
Value::Nothing { span }
}
} else {
let msg = format!("Cannot remove {:}. try --recursive", f.to_string_lossy());