Merge pull request #191 from serpilliere/fix_short_arguments

Remove conflicting short arguments

Author: serpilliere

CHANGELOG.md

@@ -9,6 +9,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Changed
 - extern-img-source short version is '-k' for all binaries
+- remove duplicate '-c' option for client/proxy/server
+- rename '--config_path' to '--args-config' for arguments config file
 ### Fixed
 - Remove default listen port for sanzu_proxy (resulting in vsock err)
 ### Removed

sanzu/src/bin/sanzu_client.rs

@@ -34,10 +34,10 @@ fn main() -> Result<()> {
     }
 
     let matches = ClientArgs::command().get_matches();
-    let config_path = matches.get_one::<std::path::PathBuf>("config_path");
+    let args_config = matches.get_one::<std::path::PathBuf>("args_config");
 
-    let mut layers = if let Some(config_path) = config_path {
-        vec![Layer::Toml(config_path.into())]
+    let mut layers = if let Some(args_config) = args_config {
+        vec![Layer::Toml(args_config.into())]
     } else {
         vec![]
     };

sanzu/src/bin/sanzu_proxy.rs

@@ -21,10 +21,10 @@ fn main() -> Result<()> {
     }
 
     let matches = ProxyArgs::command().get_matches();
-    let config_path = matches.get_one::<std::path::PathBuf>("config_path");
+    let args_config = matches.get_one::<std::path::PathBuf>("args_config");
 
-    let mut layers = if let Some(config_path) = config_path {
-        vec![Layer::Toml(config_path.into())]
+    let mut layers = if let Some(args_config) = args_config {
+        vec![Layer::Toml(args_config.into())]
     } else {
         vec![]
     };

sanzu/src/bin/sanzu_server.rs

@@ -21,10 +21,10 @@ fn main() -> Result<()> {
     }
 
     let matches = ServerArgs::command().get_matches();
-    let config_path = matches.get_one::<std::path::PathBuf>("config_path");
+    let args_config = matches.get_one::<std::path::PathBuf>("args_config");
 
-    let mut layers = if let Some(config_path) = config_path {
-        vec![Layer::Toml(config_path.into())]
+    let mut layers = if let Some(args_config) = args_config {
+        vec![Layer::Toml(args_config.into())]
     } else {
         vec![]
     };

sanzu/src/utils.rs

@@ -27,15 +27,14 @@ pub enum ClipboardConfig {
 pub struct ServerArgs {
     /// Config file
     #[clap(
-        short,
-        long = "config_path",
+        long = "args-config",
         help = r"Path of toml file storing *arguments* configuration.
 Sanzu arguments can be set regarding this priority:
 - this configuration file
 - environment variable
 - command line"
     )]
-    pub config_path: Option<std::path::PathBuf>,
+    pub args_config: Option<std::path::PathBuf>,
 
     /// Rest of arguments
     #[clap(flatten)]
@@ -178,15 +177,14 @@ tcp or vsock"
 pub struct ClientArgs {
     /// Config file
     #[clap(
-        short,
-        long = "config_path",
+        long = "args-config",
         help = r"Path of toml file storing *arguments* configuration.
 Sanzu arguments can be set regarding this priority:
 - this configuration file
 - environment variable
 - command line"
     )]
-    pub config_path: Option<std::path::PathBuf>,
+    pub args_config: Option<std::path::PathBuf>,
 
     /// Rest of arguments
     #[clap(flatten)]
@@ -323,15 +321,14 @@ without being interpreted by the local window manager"
 pub struct ProxyArgs {
     /// Config file
     #[clap(
-        short,
-        long = "config_path",
+        long = "args-config",
         help = r"Path of toml file storing *arguments* configuration.
 Sanzu arguments can be set regarding this priority:
 - this configuration file
 - environment variable
 - command line"
     )]
-    pub config_path: Option<std::path::PathBuf>,
+    pub args_config: Option<std::path::PathBuf>,
 
     /// Rest of arguments
     #[clap(flatten)]