From 506117981b2af16a35ae285ec9bea46e920626e2 Mon Sep 17 00:00:00 2001 From: jstuczyn Date: Thu, 12 Nov 2020 15:08:24 +0000 Subject: [PATCH 1/2] Slightly friendlier upgrade argument description --- clients/native/src/commands/upgrade.rs | 2 +- clients/socks5/src/commands/upgrade.rs | 2 +- gateway/src/commands/upgrade.rs | 2 +- mixnode/src/commands/upgrade.rs | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/clients/native/src/commands/upgrade.rs b/clients/native/src/commands/upgrade.rs index 391d832faa1..3cba7e32940 100644 --- a/clients/native/src/commands/upgrade.rs +++ b/clients/native/src/commands/upgrade.rs @@ -124,7 +124,7 @@ pub fn command_args<'a, 'b>() -> App<'a, 'b> { // the rest of arguments depend on the upgrade path .arg(Arg::with_name("current version") .long("current-version") - .help("REQUIRED FOR PRE-0.9.0 UPGRADES. Self provided version of the nym-client if none is available in the config. NOTE: if provided incorrectly, results may be catastrophic.") + .help("REQUIRED FOR PRE-0.9.0 UPGRADES. Specifies current version of the configuration file to help to determine a valid upgrade path.") .takes_value(true) ) } diff --git a/clients/socks5/src/commands/upgrade.rs b/clients/socks5/src/commands/upgrade.rs index 75e58790ade..7564a06180b 100644 --- a/clients/socks5/src/commands/upgrade.rs +++ b/clients/socks5/src/commands/upgrade.rs @@ -124,7 +124,7 @@ pub fn command_args<'a, 'b>() -> App<'a, 'b> { // the rest of arguments depend on the upgrade path .arg(Arg::with_name("current version") .long("current-version") - .help("REQUIRED FOR PRE-0.9.0 UPGRADES. Self provided version of the nym-socks5-client if none is available in the config. NOTE: if provided incorrectly, results may be catastrophic.") + .help("REQUIRED FOR PRE-0.9.0 UPGRADES. Specifies current version of the configuration file to help to determine a valid upgrade path.") .takes_value(true) ) } diff --git a/gateway/src/commands/upgrade.rs b/gateway/src/commands/upgrade.rs index 39d8f744a68..fcf05dfdcba 100644 --- a/gateway/src/commands/upgrade.rs +++ b/gateway/src/commands/upgrade.rs @@ -125,7 +125,7 @@ pub fn command_args<'a, 'b>() -> App<'a, 'b> { // the rest of arguments depend on the upgrade path .arg(Arg::with_name("current version") .long("current-version") - .help("REQUIRED FOR PRE-0.9.0 UPGRADES. Self provided version of the nym-gateway if none is available in the config. NOTE: if provided incorrectly, results may be catastrophic.") + .help("REQUIRED FOR PRE-0.9.0 UPGRADES. Specifies current version of the configuration file to help to determine a valid upgrade path.") .takes_value(true) ) .arg(Arg::with_name("incentives address") diff --git a/mixnode/src/commands/upgrade.rs b/mixnode/src/commands/upgrade.rs index 3eec134a209..96049f90a41 100644 --- a/mixnode/src/commands/upgrade.rs +++ b/mixnode/src/commands/upgrade.rs @@ -161,7 +161,7 @@ pub fn command_args<'a, 'b>() -> App<'a, 'b> { // the rest of arguments depend on the upgrade path .arg(Arg::with_name("current version") .long("current-version") - .help("REQUIRED FOR PRE-0.9.0 UPGRADES. Self provided version of the nym-mixnode if none is available in the config. NOTE: if provided incorrectly, results may be catastrophic.") + .help("REQUIRED FOR PRE-0.9.0 UPGRADES. Specifies current version of the configuration file to help to determine a valid upgrade path.") .takes_value(true) ) .arg(Arg::with_name("incentives address") From 8847b5d7b22d301cb2bb78e4880c13c0c2e9f471 Mon Sep 17 00:00:00 2001 From: jstuczyn Date: Thu, 12 Nov 2020 15:16:50 +0000 Subject: [PATCH 2/2] Added right format examples --- clients/native/src/commands/upgrade.rs | 2 +- clients/socks5/src/commands/upgrade.rs | 2 +- gateway/src/commands/upgrade.rs | 2 +- mixnode/src/commands/upgrade.rs | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/clients/native/src/commands/upgrade.rs b/clients/native/src/commands/upgrade.rs index 3cba7e32940..4ea784c6b2f 100644 --- a/clients/native/src/commands/upgrade.rs +++ b/clients/native/src/commands/upgrade.rs @@ -124,7 +124,7 @@ pub fn command_args<'a, 'b>() -> App<'a, 'b> { // the rest of arguments depend on the upgrade path .arg(Arg::with_name("current version") .long("current-version") - .help("REQUIRED FOR PRE-0.9.0 UPGRADES. Specifies current version of the configuration file to help to determine a valid upgrade path.") + .help("REQUIRED FOR PRE-0.9.0 UPGRADES. Specifies current version of the configuration file to help to determine a valid upgrade path. Valid formats include '0.8.1', 'v0.8.1' or 'V0.8.1'") .takes_value(true) ) } diff --git a/clients/socks5/src/commands/upgrade.rs b/clients/socks5/src/commands/upgrade.rs index 7564a06180b..6d44227286a 100644 --- a/clients/socks5/src/commands/upgrade.rs +++ b/clients/socks5/src/commands/upgrade.rs @@ -124,7 +124,7 @@ pub fn command_args<'a, 'b>() -> App<'a, 'b> { // the rest of arguments depend on the upgrade path .arg(Arg::with_name("current version") .long("current-version") - .help("REQUIRED FOR PRE-0.9.0 UPGRADES. Specifies current version of the configuration file to help to determine a valid upgrade path.") + .help("REQUIRED FOR PRE-0.9.0 UPGRADES. Specifies current version of the configuration file to help to determine a valid upgrade path. Valid formats include '0.8.1', 'v0.8.1' or 'V0.8.1'") .takes_value(true) ) } diff --git a/gateway/src/commands/upgrade.rs b/gateway/src/commands/upgrade.rs index fcf05dfdcba..9b5b11bf600 100644 --- a/gateway/src/commands/upgrade.rs +++ b/gateway/src/commands/upgrade.rs @@ -125,7 +125,7 @@ pub fn command_args<'a, 'b>() -> App<'a, 'b> { // the rest of arguments depend on the upgrade path .arg(Arg::with_name("current version") .long("current-version") - .help("REQUIRED FOR PRE-0.9.0 UPGRADES. Specifies current version of the configuration file to help to determine a valid upgrade path.") + .help("REQUIRED FOR PRE-0.9.0 UPGRADES. Specifies current version of the configuration file to help to determine a valid upgrade path. Valid formats include '0.8.1', 'v0.8.1' or 'V0.8.1'") .takes_value(true) ) .arg(Arg::with_name("incentives address") diff --git a/mixnode/src/commands/upgrade.rs b/mixnode/src/commands/upgrade.rs index 96049f90a41..af8856865c4 100644 --- a/mixnode/src/commands/upgrade.rs +++ b/mixnode/src/commands/upgrade.rs @@ -161,7 +161,7 @@ pub fn command_args<'a, 'b>() -> App<'a, 'b> { // the rest of arguments depend on the upgrade path .arg(Arg::with_name("current version") .long("current-version") - .help("REQUIRED FOR PRE-0.9.0 UPGRADES. Specifies current version of the configuration file to help to determine a valid upgrade path.") + .help("REQUIRED FOR PRE-0.9.0 UPGRADES. Specifies current version of the configuration file to help to determine a valid upgrade path. Valid formats include '0.8.1', 'v0.8.1' or 'V0.8.1'") .takes_value(true) ) .arg(Arg::with_name("incentives address")