From ed497d74c8fb664564f53520b3d0204bc906bbdf Mon Sep 17 00:00:00 2001 From: Lucas Fernandes Nogueira Date: Fri, 29 Oct 2021 09:22:10 -0300 Subject: [PATCH] fix(core): CLI API usage of positional arguments, closes #2821 (#2823) --- core/tauri/src/api/cli.rs | 9 ++++++--- docs/usage/guides/cli.md | 6 ++++-- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/core/tauri/src/api/cli.rs b/core/tauri/src/api/cli.rs index daa23998a..01f183c5a 100644 --- a/core/tauri/src/api/cli.rs +++ b/core/tauri/src/api/cli.rs @@ -178,10 +178,13 @@ fn get_app<'a>(name: &str, about: Option<&'a String>, config: &'a CliConfig) -> } fn get_arg<'a>(arg_name: &'a str, arg: &'a CliArg) -> Arg<'a> { - let mut clap_arg = Arg::new(arg_name).long(arg_name); + let mut clap_arg = Arg::new(arg_name); - if let Some(short) = arg.short { - clap_arg = clap_arg.short(short); + if arg.index.is_none() { + clap_arg = clap_arg.long(arg_name); + if let Some(short) = arg.short { + clap_arg = clap_arg.short(short); + } } clap_arg = bind_string_arg!(arg, clap_arg, description, about); diff --git a/docs/usage/guides/cli.md b/docs/usage/guides/cli.md index f712c6a4c..af4b66e3d 100644 --- a/docs/usage/guides/cli.md +++ b/docs/usage/guides/cli.md @@ -48,11 +48,13 @@ A positional argument is identified by its position in the list of arguments. Wi "args": [ { "name": "source", - "index": 1 + "index": 1, + "takesValue": true }, { "name": "destination", - "index": 2 + "index": 2, + "takesValue": true } ] }