pull/2103/merge
Fabian-Lars 1 week ago committed by GitHub
commit 3276ae4826
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

@ -0,0 +1,5 @@
---
shell: patch
---
shell.open will now try to execute `/usr/bin/xdg-open` before using `xdg-open` from `PATH`.

@ -9,6 +9,13 @@ use std::{ffi::OsStr, path::Path};
pub(crate) fn open<P: AsRef<OsStr>, S: AsRef<str>>(path: P, with: Option<S>) -> crate::Result<()> { pub(crate) fn open<P: AsRef<OsStr>, S: AsRef<str>>(path: P, with: Option<S>) -> crate::Result<()> {
match with { match with {
Some(program) => ::open::with_detached(path, program.as_ref()), Some(program) => ::open::with_detached(path, program.as_ref()),
#[cfg(target_os = "linux")]
None => {
// ref https://github.com/tauri-apps/tauri/issues/10617
::open::with_detached(&path, "/usr/bin/xdg-open")
.or_else(|_| ::open::that_detached(path))
}
#[cfg(not(target_os = "linux"))]
None => ::open::that_detached(path), None => ::open::that_detached(path),
} }
.map_err(Into::into) .map_err(Into::into)

@ -225,6 +225,13 @@ impl OpenScope {
// the `open` dependency. This behavior should be re-confirmed during upgrades of `open`. // the `open` dependency. This behavior should be re-confirmed during upgrades of `open`.
match with.map(Program::name) { match with.map(Program::name) {
Some(program) => ::open::with_detached(path, program), Some(program) => ::open::with_detached(path, program),
#[cfg(target_os = "linux")]
None => {
// ref https://github.com/tauri-apps/tauri/issues/10617
::open::with_detached(path, "/usr/bin/xdg-open")
.or_else(|_| ::open::that_detached(path))
}
#[cfg(not(target_os = "linux"))]
None => ::open::that_detached(path), None => ::open::that_detached(path),
} }
.map_err(Into::into) .map_err(Into::into)

Loading…
Cancel
Save