open.source/espanso
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(render): pprevent the shell extension from failing if stderr is not empty but process exits successfully. Fix #563

Browse Source
This commit is contained in:
Federico Terzi 2021-10-13 22:03:30 +02:00
parent af70305ccc
commit 7987e01d72
1 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
espanso-render/src/extension/shell.rs
View File

@ -24,7 +24,7 @@ use std::{
}; };
use crate::{Extension, ExtensionOutput, ExtensionResult, Params, Value}; use crate::{Extension, ExtensionOutput, ExtensionResult, Params, Value};
use log::{info, warn}; use log::{error, info};
use thiserror::Error; use thiserror::Error;
#[allow(clippy::upper_case_acronyms)] #[allow(clippy::upper_case_acronyms)]
@ -191,24 +191,16 @@ impl Extension for ShellExtension {
info!("this debug information was shown because the 'debug' option is true."); info!("this debug information was shown because the 'debug' option is true.");
} }
let ignore_error = params if !output.status.success() {
.get("ignore_error") error!(
.and_then(|v| v.as_bool())
.copied()
.unwrap_or(false);
if !output.status.success() || !error_str.trim().is_empty() {
warn!(
"shell command exited with code: {} and error: {}", "shell command exited with code: {} and error: {}",
output.status, error_str output.status, error_str
); );
if !ignore_error {
return ExtensionResult::Error( return ExtensionResult::Error(
ShellExtensionError::ExecutionError(error_str.to_string()).into(), ShellExtensionError::ExecutionError(error_str.to_string()).into(),
); );
} }
}
let trim = params let trim = params
.get("trim") .get("trim")