mirror of
https://github.com/TECHNOFAB11/pay-respects.git
synced 2025-12-12 22:40:09 +01:00
fix: not printing stderr
This commit is contained in:
parent
60616750ea
commit
0644b279a2
2 changed files with 25 additions and 10 deletions
|
|
@ -58,7 +58,7 @@ fn main() {
|
||||||
let retry_message =
|
let retry_message =
|
||||||
format!("{}", "Looking for new suggestion...".cyan().bold());
|
format!("{}", "Looking for new suggestion...".cyan().bold());
|
||||||
|
|
||||||
println!("\n{} {}", "ERROR:".red().bold(), msg);
|
// println!("\n{} {}", "ERROR:".red().bold(), msg);
|
||||||
println!("\n{}\n", retry_message);
|
println!("\n{}\n", retry_message);
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
|
|
|
||||||
|
|
@ -197,15 +197,23 @@ pub fn confirm_suggestion(shell: &str, command: &str, highlighted: &str) -> Resu
|
||||||
let process = std::process::Command::new(p)
|
let process = std::process::Command::new(p)
|
||||||
.arg(shell)
|
.arg(shell)
|
||||||
.arg("-c")
|
.arg("-c")
|
||||||
.arg(command)
|
.arg(&command)
|
||||||
.stdout(Stdio::inherit())
|
.stdout(Stdio::inherit())
|
||||||
.stderr(Stdio::piped())
|
.stderr(Stdio::inherit())
|
||||||
.output()
|
.spawn()
|
||||||
.expect("failed to execute process");
|
.expect("failed to execute process")
|
||||||
|
.wait()
|
||||||
|
.unwrap();
|
||||||
|
|
||||||
if process.status.success() {
|
if process.success() {
|
||||||
return Ok(());
|
return Ok(());
|
||||||
} else {
|
} else {
|
||||||
|
let process = std::process::Command::new(p)
|
||||||
|
.arg(shell)
|
||||||
|
.arg("-c")
|
||||||
|
.arg(command)
|
||||||
|
.output()
|
||||||
|
.expect("failed to execute process");
|
||||||
let error_msg = String::from_utf8_lossy(&process.stderr);
|
let error_msg = String::from_utf8_lossy(&process.stderr);
|
||||||
return Err(error_msg.to_string());
|
return Err(error_msg.to_string());
|
||||||
}
|
}
|
||||||
|
|
@ -216,13 +224,20 @@ pub fn confirm_suggestion(shell: &str, command: &str, highlighted: &str) -> Resu
|
||||||
.arg("-c")
|
.arg("-c")
|
||||||
.arg(command)
|
.arg(command)
|
||||||
.stdout(Stdio::inherit())
|
.stdout(Stdio::inherit())
|
||||||
.stderr(Stdio::piped())
|
.stderr(Stdio::inherit())
|
||||||
.output()
|
.spawn()
|
||||||
.expect("failed to execute process");
|
.expect("failed to execute process")
|
||||||
|
.wait()
|
||||||
|
.unwrap();
|
||||||
|
|
||||||
if process.status.success() {
|
if process.success() {
|
||||||
Ok(())
|
Ok(())
|
||||||
} else {
|
} else {
|
||||||
|
let process = std::process::Command::new(shell)
|
||||||
|
.arg("-c")
|
||||||
|
.arg(command)
|
||||||
|
.output()
|
||||||
|
.expect("failed to execute process");
|
||||||
let error_msg = String::from_utf8_lossy(&process.stderr);
|
let error_msg = String::from_utf8_lossy(&process.stderr);
|
||||||
Err(error_msg.to_string())
|
Err(error_msg.to_string())
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue