Merge branch 'main' into transit_info

Author: felinira

cli/Cargo.toml

@@ -28,7 +28,7 @@ rand = { workspace = true }
 
 # CLI specific dependencies
 magic-wormhole = { path = "..", version = "0.7", features = ["all", "entropy"] }
-clap = { workspace = true, features = ["cargo", "derive", "help"] }
+clap = { workspace = true, features = ["cargo", "derive", "help", "env"] }
 clap_complete = { workspace = true }
 env_logger = { workspace = true }
 console = { workspace = true }

cli/src/main.rs

@@ -123,10 +123,11 @@ struct CommonArgs {
         action = clap::ArgAction::Append,
         value_name = "tcp://HOSTNAME:PORT",
         value_hint = clap::ValueHint::Url,
+        env = "WORMHOLE_RELAY_URL",
     )]
     relay_server: Vec<url::Url>,
     /// Use a custom rendezvous server. Both sides need to use the same value in order to find each other.
-    #[arg(long, value_name = "ws://example.org", value_hint = clap::ValueHint::Url)]
+    #[arg(long, value_name = "ws://example.org", value_hint = clap::ValueHint::Url, env = "WORMHOLE_MAILBOX_URL")]
     rendezvous_server: Option<url::Url>,
     /// Disable the relay server support and force a direct connection.
     #[arg(long)]
@@ -245,6 +246,7 @@ enum WormholeCommand {
     version,
     author,
     about,
+    name = "wormhole-rs",
     arg_required_else_help = true,
     disable_help_subcommand = true,
     propagate_version = true,