From 4cdc9961d3c521d826d1483f57042b9b9f22c22e Mon Sep 17 00:00:00 2001 From: Markus Unterwaditzer Date: Mon, 17 Nov 2025 20:47:36 +0100 Subject: [PATCH] fix argv0 bug and update lockfile --- Cargo.lock | 73 -------------------------------------------- installer/src/lib.rs | 8 ++--- 2 files changed, 3 insertions(+), 78 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 8203670..b96c650 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1549,15 +1549,6 @@ version = "1.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4ef6b89e5b37196644d8796de5268852ff179b44e96276cf4290264843743bb7" -[[package]] -name = "encoding_rs" -version = "0.8.35" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75030f3c4f45dafd7586dd6780965a8c7e8e285a5ecb86713e63a79c5b2766f3" -dependencies = [ - "cfg-if", -] - [[package]] name = "endi" version = "1.1.0" @@ -2744,7 +2735,6 @@ dependencies = [ "tauri", "tauri-build", "tauri-plugin-opener", - "tauri-plugin-shell", ] [[package]] @@ -3824,16 +3814,6 @@ dependencies = [ "pin-project-lite", ] -[[package]] -name = "os_pipe" -version = "1.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d8fae84b431384b68627d0f9b3b1245fcf9f46f6c0e3dc902e9dce64edd1967" -dependencies = [ - "libc", - "windows-sys 0.61.2", -] - [[package]] name = "p256" version = "0.13.2" @@ -5359,44 +5339,12 @@ dependencies = [ "digest", ] -[[package]] -name = "shared_child" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e362d9935bc50f019969e2f9ecd66786612daae13e8f277be7bfb66e8bed3f7" -dependencies = [ - "libc", - "sigchld", - "windows-sys 0.60.2", -] - [[package]] name = "shlex" version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" -[[package]] -name = "sigchld" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "47106eded3c154e70176fc83df9737335c94ce22f821c32d17ed1db1f83badb1" -dependencies = [ - "libc", - "os_pipe", - "signal-hook", -] - -[[package]] -name = "signal-hook" -version = "0.3.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d881a16cf4426aa584979d30bd82cb33429027e42122b169753d6ef1085ed6e2" -dependencies = [ - "libc", - "signal-hook-registry", -] - [[package]] name = "signal-hook-registry" version = "1.4.5" @@ -5878,27 +5826,6 @@ dependencies = [ "zbus", ] -[[package]] -name = "tauri-plugin-shell" -version = "2.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c374b6db45f2a8a304f0273a15080d98c70cde86178855fc24653ba657a1144c" -dependencies = [ - "encoding_rs", - "log", - "open", - "os_pipe", - "regex", - "schemars 0.8.22", - "serde", - "serde_json", - "shared_child", - "tauri", - "tauri-plugin", - "thiserror 2.0.12", - "tokio", -] - [[package]] name = "tauri-runtime" version = "2.9.1" diff --git a/installer/src/lib.rs b/installer/src/lib.rs index a569c0a..12b02e0 100644 --- a/installer/src/lib.rs +++ b/installer/src/lib.rs @@ -292,7 +292,7 @@ pub type OutputCallback = Box; /// /// // if the callback is None, stdout/stderr is going to be used /// let result = installer::run_with_callback( -/// ["installer", "orbic-network", "--admin-password", "12345"], +/// ["orbic-network", "--admin-password", "12345"], /// Some(Box::new(|output| { /// print!("{}", output); /// })) @@ -312,11 +312,9 @@ pub fn run_with_callback<'a>( .build() .context("Failed to create Tokio runtime")? .block_on(async { - // Parse arguments - let parsed_args = - Args::try_parse_from(args.into_iter()).context("Failed to parse arguments")?; + let args = std::iter::once("installer").chain(args); + let parsed_args = Args::try_parse_from(args).context("Failed to parse arguments")?; - // Run the installer run(parsed_args).await }) }