technofab/pay-respects
1
0
Fork 0
mirror of https://github.com/TECHNOFAB11/pay-respects.git synced 2025-12-12 14:30:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: fallback to stdout if stderr is empty

Browse source
This commit is contained in:
iff 2024-09-24 18:28:13 +02:00
parent 96a588799d
commit adfedfad3d
1 changed files with 17 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

23
src/shell.rs
View file

@ -26,12 +26,23 @@ pub fn command_output(shell: &str, command: &str) -> String {
});
match receiver.recv_timeout(Duration::from_secs(3)) {
Ok(output) => String::from_utf8_lossy(&output.stderr)
.to_string()
.split_whitespace()
.collect::<Vec<&str>>()
.join(" ")
.to_lowercase(),
Ok(output) => {
if !output.stderr.is_empty() {
String::from_utf8_lossy(&output.stderr)
.to_string()
.split_whitespace()
.collect::<Vec<&str>>()
.join(" ")
.to_lowercase()
} else {
String::from_utf8_lossy(&output.stdout)
.to_string()
.split_whitespace()
.collect::<Vec<&str>>()
.join(" ")
.to_lowercase()
}
}
Err(_) => {
use colored::*;
eprintln!("Timeout while executing command: {}", command.red());