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

just render the original command

Browse Source
This commit is contained in:
Ralph Caraveo 2020-07-10 21:47:10 -07:00
parent 0c49adcc12
commit 239461e520
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/extension/shell.rs
View File

@ -17,7 +17,7 @@
* along with espanso. If not, see <https://www.gnu.org/licenses/>. * along with espanso. If not, see <https://www.gnu.org/licenses/>.
*/ */
use log::{info, error, warn}; use log::{error, info, warn};
use regex::{Captures, Regex}; use regex::{Captures, Regex};
use serde_yaml::{Mapping, Value}; use serde_yaml::{Mapping, Value};
use std::process::{Command, Output}; use std::process::{Command, Output};
@ -126,11 +126,12 @@ impl super::Extension for ShellExtension {
warn!("No 'cmd' parameter specified for shell variable"); warn!("No 'cmd' parameter specified for shell variable");
return None; return None;
} }
let cmd = cmd.unwrap().as_str().unwrap();
let original_cmd = cmd.unwrap().as_str().unwrap();
// Render positional parameters in args // Render positional parameters in args
let cmd = POS_ARG_REGEX let cmd = POS_ARG_REGEX
.replace_all(&cmd, |caps: &Captures| { .replace_all(&original_cmd, |caps: &Captures| {
let position_str = caps.name("pos").unwrap().as_str(); let position_str = caps.name("pos").unwrap().as_str();
let position = position_str.parse::<i32>().unwrap_or(-1); let position = position_str.parse::<i32>().unwrap_or(-1);
if position >= 0 && position < args.len() as i32 { if position >= 0 && position < args.len() as i32 {
@ -176,12 +177,15 @@ impl super::Extension for ShellExtension {
let with_debug = if let Some(value) = debug_opt { let with_debug = if let Some(value) = debug_opt {
let val = value.as_bool(); let val = value.as_bool();
val.unwrap_or(false) val.unwrap_or(false)
}else{ } else {
false false
}; };
if with_debug { if with_debug {
info!("debug for shell cmd '{}', exit_status '{}', stdout '{}', stderr '{}'", cmd, output.status, output_str, error_str); info!(
"debug for shell cmd '{}', exit_status '{}', stdout '{}', stderr '{}'",
original_cmd, output.status, output_str, error_str
);
} }
// If specified, trim the output // If specified, trim the output