CalvinBackup/tauri
1
0
Fork 0
mirror of https://github.com/tauri-apps/tauri.git synced 2026-04-01 10:01:07 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix(core): sidecar usage on Windows, closes #3341 (#3345)

Browse Source
This commit is contained in:
Lucas Fernandes Nogueira
2022-02-06 16:59:20 -03:00
committed by GitHub
parent 5e7611aaa7
commit 6330b66be7
2 changed files with 158 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/tauri/src/api/process/command.rs
View File

@@ -151,9 +151,11 @@ pub struct Output {
}
fn relative_command_path(command: String) -> crate::Result<String> {
let ext = if cfg!(windows) { ".exe" } else { "" };
match platform::current_exe()?.parent() {
Some(exe_dir) => Ok(format!("{}/{}{}", exe_dir.display(), command, ext)),
#[cfg(windows)]
Some(exe_dir) => Ok(format!("{}\\{}.exe", exe_dir.display(), command)),
#[cfg(not(windows))]
Some(exe_dir) => Ok(format!("{}/{}", exe_dir.display(), command)),
None => Err(crate::api::Error::Command("Could not evaluate executable dir".to_string()).into()),
}
}

252
examples/sidecar/src-tauri/Cargo.lock generated
View File

@@ -52,9 +52,9 @@ checksum = "8da52d66c7071e2e3fa2a1e5c6d088fec47b593032b254f5e980de8ea54454d6"
[[package]]
name = "atk"
version = "0.14.0"
version = "0.15.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a83b21d2aa75e464db56225e1bda2dd5993311ba1095acaa8fa03d1ae67026ba"
checksum = "2c3d816ce6f0e2909a96830d6911c2aff044370b1ef92d7f267b43bae5addedd"
dependencies = [
"atk-sys",
"bitflags",
@@ -64,14 +64,14 @@ dependencies = [
[[package]]
name = "atk-sys"
version = "0.14.0"
version = "0.15.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "badcf670157c84bb8b1cf6b5f70b650fed78da2033c9eed84c4e49b11cbe83ea"
checksum = "58aeb089fb698e06db8089971c7ee317ab9644bade33383f63631437b03aafb6"
dependencies = [
"glib-sys",
"gobject-sys",
"glib-sys 0.15.5",
"gobject-sys 0.15.5",
"libc",
"system-deps 3.2.0",
"system-deps 6.0.1",
]
[[package]]
@@ -184,9 +184,9 @@ dependencies = [
[[package]]
name = "cairo-rs"
version = "0.14.9"
version = "0.15.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "33b5725979db0c586d98abad2193cdb612dd40ef95cd26bd99851bf93b3cb482"
checksum = "b869e97a87170f96762f9f178eae8c461147e722ba21dd8814105bf5716bf14a"
dependencies = [
"bitflags",
"cairo-sys-rs",
@@ -197,13 +197,13 @@ dependencies = [
[[package]]
name = "cairo-sys-rs"
version = "0.14.9"
version = "0.15.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b448b876970834fda82ba3aeaccadbd760206b75388fc5c1b02f1e343b697570"
checksum = "3c55d429bef56ac9172d25fecb85dc8068307d17acd74b377866b7a1ef25d3c8"
dependencies = [
"glib-sys",
"glib-sys 0.15.5",
"libc",
"system-deps 3.2.0",
"system-deps 6.0.1",
]
[[package]]
@@ -841,9 +841,9 @@ dependencies = [
[[package]]
name = "gdk"
version = "0.14.3"
version = "0.15.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b9d749dcfc00d8de0d7c3a289e04a04293eb5ba3d8a4e64d64911d481fa9933b"
checksum = "614258e81ec35ed8770e64a0838f3a47f95b398bc51e724d3b3fa09c1ee0f8d5"
dependencies = [
"bitflags",
"cairo-rs",
@@ -857,10 +857,11 @@ dependencies = [
[[package]]
name = "gdk-pixbuf"
version = "0.14.0"
version = "0.15.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "534192cb8f01daeb8fab2c8d4baa8f9aae5b7a39130525779f5c2608e235b10f"
checksum = "73aa2f5de1b45710da90a55863276667dc3a3264aaf6a2aeace62bb015244d49"
dependencies = [
"bitflags",
"gdk-pixbuf-sys",
"gio",
"glib",
@@ -869,44 +870,44 @@ dependencies = [
[[package]]
name = "gdk-pixbuf-sys"
version = "0.14.0"
version = "0.15.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f097c0704201fbc8f69c1762dc58c6947c8bb188b8ed0bc7e65259f1894fe590"
checksum = "413424d9818621fa3cfc8a3a915cdb89a7c3c507d56761b4ec83a9a98e587171"
dependencies = [
"gio-sys",
"glib-sys",
"gobject-sys",
"gio-sys 0.15.5",
"glib-sys 0.15.5",
"gobject-sys 0.15.5",
"libc",
"system-deps 3.2.0",
"system-deps 6.0.1",
]
[[package]]
name = "gdk-sys"
version = "0.14.0"
version = "0.15.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0e091b3d3d6696949ac3b3fb3c62090e5bfd7bd6850bef5c3c5ea701de1b1f1e"
checksum = "32e7a08c1e8f06f4177fb7e51a777b8c1689f743a7bc11ea91d44d2226073a88"
dependencies = [
"cairo-sys-rs",
"gdk-pixbuf-sys",
"gio-sys",
"glib-sys",
"gobject-sys",
"gio-sys 0.15.5",
"glib-sys 0.15.5",
"gobject-sys 0.15.5",
"libc",
"pango-sys",
"pkg-config",
"system-deps 3.2.0",
"system-deps 6.0.1",
]
[[package]]
name = "gdkx11-sys"
version = "0.14.0"
version = "0.15.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "38cefbc8ac7be19c9b51f54fbd7cef48b70495a4cb23a812e2137e75b484b29d"
checksum = "b4b7f8c7a84b407aa9b143877e267e848ff34106578b64d1e0a24bf550716178"
dependencies = [
"gdk-sys",
"glib-sys",
"glib-sys 0.15.5",
"libc",
"system-deps 3.2.0",
"system-deps 6.0.1",
"x11",
]
@@ -957,15 +958,15 @@ dependencies = [
[[package]]
name = "gio"
version = "0.14.8"
version = "0.15.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "711c3632b3ebd095578a9c091418d10fed492da9443f58ebc8f45efbeb215cb0"
checksum = "59105fa464928adf56b159c8d980cc11fbfbe414befb904caac5163d383049bf"
dependencies = [
"bitflags",
"futures-channel",
"futures-core",
"futures-io",
"gio-sys",
"gio-sys 0.15.5",
"glib",
"libc",
"once_cell",
@@ -978,18 +979,31 @@ version = "0.14.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c0a41df66e57fcc287c4bcf74fc26b884f31901ea9792ec75607289b456f48fa"
dependencies = [
"glib-sys",
"gobject-sys",
"glib-sys 0.14.0",
"gobject-sys 0.14.0",
"libc",
"system-deps 3.2.0",
"winapi",
]
[[package]]
name = "glib"
version = "0.14.8"
name = "gio-sys"
version = "0.15.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7c515f1e62bf151ef6635f528d05b02c11506de986e43b34a5c920ef0b3796a4"
checksum = "4f0bc4cfc9ebcdd05cc5057bc51b99c32f8f9bf246274f6a556ffd27279f8fe3"
dependencies = [
"glib-sys 0.15.5",
"gobject-sys 0.15.5",
"libc",
"system-deps 6.0.1",
"winapi",
]
[[package]]
name = "glib"
version = "0.15.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "41dcfbdb6cc6c02aee163339465d8a40d6f3f64c3a43f729a4195f0e153338b7"
dependencies = [
"bitflags",
"futures-channel",
@@ -997,21 +1011,22 @@ dependencies = [
"futures-executor",
"futures-task",
"glib-macros",
"glib-sys",
"gobject-sys",
"glib-sys 0.15.5",
"gobject-sys 0.15.5",
"libc",
"once_cell",
"smallvec",
"thiserror",
]
[[package]]
name = "glib-macros"
version = "0.14.1"
version = "0.15.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2aad66361f66796bfc73f530c51ef123970eb895ffba991a234fcf7bea89e518"
checksum = "e58b262ff65ef771003873cea8c10e0fe854f1c508d48d62a4111a1ff163f7d1"
dependencies = [
"anyhow",
"heck 0.3.3",
"heck 0.4.0",
"proc-macro-crate 1.1.0",
"proc-macro-error",
"proc-macro2",
@@ -1029,6 +1044,16 @@ dependencies = [
"system-deps 3.2.0",
]
[[package]]
name = "glib-sys"
version = "0.15.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fa1d4e1a63d8574541e5b92931e4e669ddc87ffa85d58e84e631dba13ad2e10c"
dependencies = [
"libc",
"system-deps 6.0.1",
]
[[package]]
name = "glob"
version = "0.3.0"
@@ -1054,16 +1079,27 @@ version = "0.14.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "aa92cae29759dae34ab5921d73fff5ad54b3d794ab842c117e36cafc7994c3f5"
dependencies = [
"glib-sys",
"glib-sys 0.14.0",
"libc",
"system-deps 3.2.0",
]
[[package]]
name = "gtk"
version = "0.14.3"
name = "gobject-sys"
version = "0.15.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2eb51122dd3317e9327ec1e4faa151d1fa0d95664cd8fb8dcfacf4d4d29ac70c"
checksum = "df6859463843c20cf3837e3a9069b6ab2051aeeadf4c899d33344f4aea83189a"
dependencies = [
"glib-sys 0.15.5",
"libc",
"system-deps 6.0.1",
]
[[package]]
name = "gtk"
version = "0.15.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c7978eaec05bea63947c801d29a21372f2ed39aec0bf56bf7725d3599094675e"
dependencies = [
"atk",
"bitflags",
@@ -1084,30 +1120,29 @@ dependencies = [
[[package]]
name = "gtk-sys"
version = "0.14.0"
version = "0.15.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8c14c8d3da0545785a7c5a120345b3abb534010fb8ae0f2ef3f47c027fba303e"
checksum = "d5bc2f0587cba247f60246a0ca11fe25fb733eabc3de12d1965fc07efab87c84"
dependencies = [
"atk-sys",
"cairo-sys-rs",
"gdk-pixbuf-sys",
"gdk-sys",
"gio-sys",
"glib-sys",
"gobject-sys",
"gio-sys 0.15.5",
"glib-sys 0.15.5",
"gobject-sys 0.15.5",
"libc",
"pango-sys",
"system-deps 3.2.0",
"system-deps 6.0.1",
]
[[package]]
name = "gtk3-macros"
version = "0.14.0"
version = "0.15.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "21de1da96dc117443fb03c2e270b2d34b7de98d0a79a19bbb689476173745b79"
checksum = "8c891188af69e77a1e8a0b1746fbd03b9b396e7d34d518c5331b15950259f541"
dependencies = [
"anyhow",
"heck 0.3.3",
"proc-macro-crate 1.1.0",
"proc-macro-error",
"proc-macro2",
@@ -1265,9 +1300,9 @@ checksum = "1aab8fc367588b89dcee83ab0fd66b72b50b72fa1904d7095045ace2b0c81c35"
[[package]]
name = "javascriptcore-rs"
version = "0.15.2"
version = "0.16.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e207780c1d1cd3c36056695e44010a19dd481574a2106cd2540edda4128a9794"
checksum = "bf053e7843f2812ff03ef5afe34bb9c06ffee120385caad4f6b9967fcd37d41c"
dependencies = [
"bitflags",
"glib",
@@ -1276,12 +1311,12 @@ dependencies = [
[[package]]
name = "javascriptcore-rs-sys"
version = "0.3.3"
version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2adf2de824b178d76c6017da59f4e7e95de49a766b584c59d47821a6c3dce9e2"
checksum = "905fbb87419c5cde6e3269537e4ea7d46431f3008c5d057e915ef3f115e7793c"
dependencies = [
"glib-sys",
"gobject-sys",
"glib-sys 0.15.5",
"gobject-sys 0.15.5",
"libc",
"system-deps 5.0.0",
]
@@ -1618,9 +1653,9 @@ dependencies = [
[[package]]
name = "pango"
version = "0.14.8"
version = "0.15.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "546fd59801e5ca735af82839007edd226fe7d3bb06433ec48072be4439c28581"
checksum = "79211eff430c29cc38c69e0ab54bc78fa1568121ca9737707eee7f92a8417a94"
dependencies = [
"bitflags",
"glib",
@@ -1631,14 +1666,14 @@ dependencies = [
[[package]]
name = "pango-sys"
version = "0.14.0"
version = "0.15.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2367099ca5e761546ba1d501955079f097caa186bb53ce0f718dca99ac1942fe"
checksum = "7022c2fb88cd2d9d55e1a708a8c53a3ae8678234c4a54bf623400aeb7f31fac2"
dependencies = [
"glib-sys",
"gobject-sys",
"glib-sys 0.15.5",
"gobject-sys 0.15.5",
"libc",
"system-deps 3.2.0",
"system-deps 6.0.1",
]
[[package]]
@@ -2342,9 +2377,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9f056675eda9a7417163e5f742bb119e8e1d385edd2ada8f7031a7230a3ec10a"
dependencies = [
"bitflags",
"gio-sys",
"glib-sys",
"gobject-sys",
"gio-sys 0.14.0",
"glib-sys 0.14.0",
"gobject-sys 0.14.0",
"libc",
"system-deps 5.0.0",
]
@@ -2462,7 +2497,7 @@ dependencies = [
"strum_macros",
"thiserror",
"toml",
"version-compare",
"version-compare 0.0.11",
]
[[package]]
@@ -2475,13 +2510,27 @@ dependencies = [
"heck 0.3.3",
"pkg-config",
"toml",
"version-compare",
"version-compare 0.0.11",
]
[[package]]
name = "system-deps"
version = "6.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ad3a97fdef3daf935d929b3e97e5a6a680cd4622e40c2941ca0875d6566416f8"
dependencies = [
"cfg-expr 0.9.1",
"heck 0.4.0",
"pkg-config",
"toml",
"version-compare 0.1.0",
]
[[package]]
name = "tao"
version = "0.5.2"
source = "git+https://github.com/tauri-apps/tao?branch=next#cf3d3b54ae3e32b4b7577240a93510f46c30593f"
version = "0.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "53d2bba60298cbc0ff0651fe5a0bdfb73438b91231f700dcc8d539548237cae7"
dependencies = [
"bitflags",
"cairo-rs",
@@ -2497,7 +2546,7 @@ dependencies = [
"gdkx11-sys",
"gio",
"glib",
"glib-sys",
"glib-sys 0.15.5",
"gtk",
"instant",
"lazy_static",
@@ -2938,6 +2987,12 @@ version = "0.0.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1c18c859eead79d8b95d09e4678566e8d70105c4e7b251f707a03df32442661b"
[[package]]
name = "version-compare"
version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fe88247b92c1df6b6de80ddc290f3976dbdf2f5f5d3fd049a9fb598c6dd5ca73"
[[package]]
name = "version_check"
version = "0.9.4"
@@ -2975,19 +3030,19 @@ checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6"
[[package]]
name = "webkit2gtk"
version = "0.16.0"
version = "0.17.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "07654baccd8874fc7c99cc33c27052fb02804276102dff0f78f981669316e0e9"
checksum = "2cbd39499e917de9dad36eb11c09f665eb984d432638ae7971feed98eb96df88"
dependencies = [
"bitflags",
"cairo-rs",
"gdk",
"gdk-sys",
"gio",
"gio-sys",
"gio-sys 0.15.5",
"glib",
"glib-sys",
"gobject-sys",
"glib-sys 0.15.5",
"gobject-sys 0.15.5",
"gtk",
"gtk-sys",
"javascriptcore-rs",
@@ -2998,18 +3053,18 @@ dependencies = [
[[package]]
name = "webkit2gtk-sys"
version = "0.16.0"
version = "0.17.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "854a0cbf3570541bf13df70aac23826da7cd88f27a722b7b2043f32637373113"
checksum = "ddcce6f1e0fc7715d651dba29875741509f5fc12f4e2976907272a74405f2b01"
dependencies = [
"atk-sys",
"bitflags",
"cairo-sys-rs",
"gdk-pixbuf-sys",
"gdk-sys",
"gio-sys",
"glib-sys",
"gobject-sys",
"gio-sys 0.15.5",
"glib-sys 0.15.5",
"gobject-sys 0.15.5",
"gtk-sys",
"javascriptcore-rs-sys",
"libc",
@@ -3185,8 +3240,9 @@ dependencies = [
[[package]]
name = "wry"
version = "0.12.2"
source = "git+https://github.com/tauri-apps/wry?rev=ddb695afda719e8dd32fa584b336b7c9ff574399#ddb695afda719e8dd32fa584b336b7c9ff574399"
version = "0.13.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7f4875fbbfc2c63f6c57c4ef84f678b1b57e3b8795443add7fbd02f3e8017e30"
dependencies = [
"cocoa",
"core-graphics",
@@ -3259,18 +3315,18 @@ dependencies = [
[[package]]
name = "zstd"
version = "0.9.2+zstd.1.5.1"
version = "0.10.0+zstd.1.5.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2390ea1bf6c038c39674f22d95f0564725fc06034a47129179810b2fc58caa54"
checksum = "3b1365becbe415f3f0fcd024e2f7b45bacfb5bdd055f0dc113571394114e7bdd"
dependencies = [
"zstd-safe",
]
[[package]]
name = "zstd-safe"
version = "4.1.3+zstd.1.5.1"
version = "4.1.4+zstd.1.5.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e99d81b99fb3c2c2c794e3fe56c305c63d5173a16a46b5850b07c935ffc7db79"
checksum = "2f7cd17c9af1a4d6c24beb1cc54b17e2ef7b593dc92f19e9d9acad8b182bbaee"
dependencies = [
"libc",
"zstd-sys",
@@ -3278,9 +3334,9 @@ dependencies = [
[[package]]
name = "zstd-sys"
version = "1.6.2+zstd.1.5.1"
version = "1.6.3+zstd.1.5.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2daf2f248d9ea44454bfcb2516534e8b8ad2fc91bf818a1885495fc42bc8ac9f"
checksum = "fc49afa5c8d634e75761feda8c592051e7eeb4683ba827211eb0d731d3402ea8"
dependencies = [
"cc",
"libc",