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

Change Windows shell to Powershell and display error in logs if command failed.

Browse Source
This commit is contained in:
Federico Terzi 2020-05-05 19:50:35 +02:00
parent 4283dd4b3a
commit 70260aa0b7
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/extension/shell.rs
View File

@ -63,8 +63,8 @@ impl super::Extension for ShellExtension {
}).to_string(); }).to_string();
let output = if cfg!(target_os = "windows") { let output = if cfg!(target_os = "windows") {
Command::new("cmd") Command::new("powershell")
.args(&["/C", &cmd]) .args(&["-Command", &cmd])
.output() .output()
} else { } else {
Command::new("sh") Command::new("sh")
@ -77,6 +77,14 @@ impl super::Extension for ShellExtension {
Ok(output) => { Ok(output) => {
let output_str = String::from_utf8_lossy(output.stdout.as_slice()); let output_str = String::from_utf8_lossy(output.stdout.as_slice());
let mut output_str = output_str.into_owned(); let mut output_str = output_str.into_owned();
let error_str = String::from_utf8_lossy(output.stderr.as_slice());
let error_str = error_str.to_string();
let error_str = error_str.trim();
// Print stderror if present
if !error_str.is_empty() {
warn!("Shell command reported error: \n{}", error_str);
}
// If specified, trim the output // If specified, trim the output
let trim_opt = params.get(&Value::from("trim")); let trim_opt = params.get(&Value::from("trim"));