Skip to content

Commit 2d87f6d

Browse files
authored
Merge branch 'main' into transit_info
2 parents 0ae287c + 7287e34 commit 2d87f6d

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

cli/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ rand = { workspace = true }
2828

2929
# CLI specific dependencies
3030
magic-wormhole = { path = "..", version = "0.7", features = ["all", "entropy"] }
31-
clap = { workspace = true, features = ["cargo", "derive", "help"] }
31+
clap = { workspace = true, features = ["cargo", "derive", "help", "env"] }
3232
clap_complete = { workspace = true }
3333
env_logger = { workspace = true }
3434
console = { workspace = true }

cli/src/main.rs

+3-1
Original file line numberDiff line numberDiff line change
@@ -123,10 +123,11 @@ struct CommonArgs {
123123
action = clap::ArgAction::Append,
124124
value_name = "tcp://HOSTNAME:PORT",
125125
value_hint = clap::ValueHint::Url,
126+
env = "WORMHOLE_RELAY_URL",
126127
)]
127128
relay_server: Vec<url::Url>,
128129
/// Use a custom rendezvous server. Both sides need to use the same value in order to find each other.
129-
#[arg(long, value_name = "ws://example.org", value_hint = clap::ValueHint::Url)]
130+
#[arg(long, value_name = "ws://example.org", value_hint = clap::ValueHint::Url, env = "WORMHOLE_MAILBOX_URL")]
130131
rendezvous_server: Option<url::Url>,
131132
/// Disable the relay server support and force a direct connection.
132133
#[arg(long)]
@@ -245,6 +246,7 @@ enum WormholeCommand {
245246
version,
246247
author,
247248
about,
249+
name = "wormhole-rs",
248250
arg_required_else_help = true,
249251
disable_help_subcommand = true,
250252
propagate_version = true,

0 commit comments

Comments
 (0)