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

run_external: only suggest alternative commands when file not found (#6311)

Browse Source
This commit is contained in:
Reilly Wood 2022-08-12 21:27:50 -07:00 committed by GitHub
parent cb18dd5200
commit 3b6c4c1bb5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 35 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
crates/nu-command/src/system/run_external.rs
View File

@ -205,6 +205,9 @@ impl ExternalCommand {
match child { match child {
Err(err) => { Err(err) => {
match err.kind() {
// If file not found, try suggesting alternative commands to the user
std::io::ErrorKind::NotFound => {
// recommend a replacement if the user tried a deprecated command // recommend a replacement if the user tried a deprecated command
let command_name_lower = self.name.item.to_lowercase(); let command_name_lower = self.name.item.to_lowercase();
let deprecated = crate::deprecated_commands(); let deprecated = crate::deprecated_commands();
@ -220,8 +223,6 @@ impl ExternalCommand {
)); ));
} }
// If we try to run an external but can't, there's a good chance
// that the user entered the wrong command name
let suggestion = suggest_command(&self.name.item, engine_state); let suggestion = suggest_command(&self.name.item, engine_state);
let label = match suggestion { let label = match suggestion {
Some(s) => format!("did you mean '{s}'?"), Some(s) => format!("did you mean '{s}'?"),
@ -234,6 +235,14 @@ impl ExternalCommand {
self.name.span, self.name.span,
)) ))
} }
// otherwise, a default error message
_ => Err(ShellError::ExternalCommand(
"can't run executable".into(),
err.to_string(),
self.name.span,
)),
}
}
Ok(mut child) => { Ok(mut child) => {
if !input.is_nothing() { if !input.is_nothing() {
let mut engine_state = engine_state.clone(); let mut engine_state = engine_state.clone();