Skip to content

Commit

Permalink
fix(core): fix compilation when shell-execute or shell-sidecar (#…
Browse files Browse the repository at this point in the history
…9729)

* fix(core): fix compilation when `shell-execute` or `shell-sidecar`

regression from: #9706

* change file
  • Loading branch information
amrbashir committed May 9, 2024
1 parent 15c62b5 commit ef35a79
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 2 deletions.
5 changes: 5 additions & 0 deletions .changes/shell-execute.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"tauri": "patch:bug"
---

Fix compilation error when `shell-execute` or `shell-sidecar` features are not active
6 changes: 4 additions & 2 deletions core/tauri/src/endpoints/shell.rs
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,8 @@ impl Cmd {
let encoding = options
.encoding
.as_ref()
.and_then(|encoding| crate::api::process::Encoding::for_label(encoding.as_bytes()));
.and_then(|encoding| encoding_rs::Encoding::for_label(encoding.as_bytes()));

let command = prepare_cmd(&context, &program, args, options)?;

let mut command: std::process::Command = command.into();
Expand Down Expand Up @@ -222,6 +223,7 @@ impl Cmd {
}
}

#[cfg(any(shell_execute, shell_sidecar))]
fn prepare_cmd<R: Runtime>(
context: &InvokeContext<R>,
program: &String,
Expand Down Expand Up @@ -287,7 +289,7 @@ fn prepare_cmd<R: Runtime>(
command = command.env_clear();
}
if let Some(encoding) = &options.encoding {
if let Some(encoding) = crate::api::process::Encoding::for_label(encoding.as_bytes()) {
if let Some(encoding) = encoding_rs::Encoding::for_label(encoding.as_bytes()) {
command = command.encoding(encoding);
} else {
return Err(anyhow::anyhow!(format!("unknown encoding {encoding}")));
Expand Down

0 comments on commit ef35a79

Please sign in to comment.