diff options
| author | Justus Winter <justus@sequoia-pgp.org> | 2018-05-14 16:34:04 +0200 |
|---|---|---|
| committer | Justus Winter <justus@sequoia-pgp.org> | 2018-05-14 16:34:04 +0200 |
| commit | 1445fe4d42913ba0ee0489dd1ed45935038569d4 (patch) | |
| tree | 85f96ff6939a89d43cf7407b9814f4a9b6bb990e /tool | |
| parent | 1b3992ce442baddcc2c84485f4a17d50c40db8a9 (diff) | |
tool: Tweak 'sqv's flag handling.
- Clarify that multiple keyrings can be given, but only accept one
per '--keyring' argument. This lets us use the '--keyring'
argument in the front.
- Simplify by removing superfluous configurations.
Diffstat (limited to 'tool')
| -rw-r--r-- | tool/src/sqv.rs | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/tool/src/sqv.rs b/tool/src/sqv.rs index 386e284a..e949618a 100644 --- a/tool/src/sqv.rs +++ b/tool/src/sqv.rs @@ -24,26 +24,24 @@ fn cli_build() -> App<'static, 'static> { .about("sqv is a command-line OpenPGP signature verification tool.") .setting(AppSettings::ArgRequiredElseHelp) .arg(Arg::with_name("keyring").value_name("FILE") - .help("A keyring") + .help("A keyring. Can be given multiple times.") .long("keyring") .short("r") .required(true) .takes_value(true) + .number_of_values(1) .multiple(true)) .arg(Arg::with_name("signatures").value_name("N") .help("The number of valid signatures to return success. Default: 1") .long("signatures") .short("n") - .takes_value(true) - .multiple(false)) + .takes_value(true)) .arg(Arg::with_name("sig-file").value_name("SIG-FILE") .help("File containing the detached signature.") - .required(true) - .index(1)) + .required(true)) .arg(Arg::with_name("file").value_name("FILE") .help("File to verify.") - .required(true) - .index(2)) + .required(true)) .arg(Arg::with_name("trace") .help("Trace execution.") .long("trace")) |