diff options
| author | Robin Krahl <robin.krahl@ireas.org> | 2020-01-26 09:17:49 +0100 |
|---|---|---|
| committer | Daniel Mueller <deso@posteo.net> | 2020-01-26 09:24:43 -0800 |
| commit | 262df06856c02de25486afebe2956d0dee07356c (patch) | |
| tree | 4c15c78504dadac5b7a8f4303613468381b6bb05 | |
| parent | 5a781ef0f2276436fa90dd3097817d06a9510c9a (diff) | |
| download | nitrocli-262df06856c02de25486afebe2956d0dee07356c.tar.gz nitrocli-262df06856c02de25486afebe2956d0dee07356c.tar.bz2 | |
Make --verbose and --model options global
This patch adds the attribute `global = true` for the top-level
--verbose and --model options, which ensures that they can also be set
for subcommands. For example:
nitrocli status --model pro
Instead of only:
nitrocli --model pro status
| -rw-r--r-- | nitrocli/CHANGELOG.md | 1 | ||||
| -rw-r--r-- | nitrocli/src/args.rs | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/nitrocli/CHANGELOG.md b/nitrocli/CHANGELOG.md index 53847e5..02812e0 100644 --- a/nitrocli/CHANGELOG.md +++ b/nitrocli/CHANGELOG.md @@ -5,6 +5,7 @@ Unreleased - Added `structopt` dependency in version `0.3.7` - Replaced `argparse` with `structopt` - Removed the `argparse` dependency + - Made the --verbose and --model options global - Bumped `nitrokey` dependency to `0.5.1` diff --git a/nitrocli/src/args.rs b/nitrocli/src/args.rs index 57e9743..df93814 100644 --- a/nitrocli/src/args.rs +++ b/nitrocli/src/args.rs @@ -74,10 +74,10 @@ impl<'io> Stdio for ExecCtx<'io> { #[structopt(name = "nitrocli")] struct Args { /// Increases the log level (can be supplied multiple times) - #[structopt(short, long, parse(from_occurrences))] + #[structopt(short, long, global = true, parse(from_occurrences))] verbose: u8, /// Selects the device model to connect to - #[structopt(short, long, possible_values = &DeviceModel::all_str())] + #[structopt(short, long, global = true, possible_values = &DeviceModel::all_str())] model: Option<DeviceModel>, #[structopt(subcommand)] cmd: Command, |