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

Inject CONFIG env variable when executing Shell and Script extensions. Fix #277

Browse Source
This commit is contained in:
Federico Terzi 2020-05-29 22:07:00 +02:00
parent a37c588e26
commit a57f828652
2 changed files with 39 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/extension/script.rs
View File

@ -75,10 +75,15 @@ impl super::Extension for ScriptExtension {
}
});
let mut command = Command::new(&str_args[0]);
// Inject the $CONFIG variable
command.env("CONFIG", crate::context::get_config_dir());
let output = if str_args.len() > 1 {
Command::new(&str_args[0]).args(&str_args[1..]).output()
command.args(&str_args[1..]).output()
} else {
Command::new(&str_args[0]).output()
command.output()
};
match output {

41
src/extension/shell.rs
View File

@ -40,15 +40,38 @@ pub enum Shell {
impl Shell {
fn execute_cmd(&self, cmd: &str) -> std::io::Result<Output> {
match self {
Shell::Cmd => Command::new("cmd").args(&["/C", &cmd]).output(),
Shell::Powershell => Command::new("powershell")
.args(&["-Command", &cmd])
.output(),
Shell::WSL => Command::new("wsl").args(&["bash", "-c", &cmd]).output(),
Shell::Bash => Command::new("bash").args(&["-c", &cmd]).output(),
Shell::Sh => Command::new("sh").args(&["-c", &cmd]).output(),
}
let mut command = match self {
Shell::Cmd => {
let mut command = Command::new("cmd");
command.args(&["/C", &cmd]);
command
},
Shell::Powershell => {
let mut command = Command::new("powershell");
command.args(&["-Command", &cmd]);
command
},
Shell::WSL => {
let mut command = Command::new("wsl");
command.args(&["bash", "-c", &cmd]);
command
},
Shell::Bash => {
let mut command = Command::new("bash");
command.args(&["-c", &cmd]);
command
},
Shell::Sh => {
let mut command = Command::new("sh");
command.args(&["-c", &cmd]);
command
},
};
// Inject the $CONFIG variable
command.env("CONFIG", crate::context::get_config_dir());
command.output()
}
fn from_string(shell: &str) -> Option<Shell> {