diff options
| author | Justus Winter <justus@sequoia-pgp.org> | 2021-01-20 10:18:41 +0100 |
|---|---|---|
| committer | Justus Winter <justus@sequoia-pgp.org> | 2021-01-20 11:38:59 +0100 |
| commit | 3eaca9d75d776226fa022528b59411b8e34b30d5 (patch) | |
| tree | 1f4701dc49915bae0559a2271b44a64da72186e9 | |
| parent | 5524d6ac4ec9bf813a159bc98d2947961adc1afe (diff) | |
sq: Call the armoring subcommand 'armor' like in SOP.
| -rw-r--r-- | sq/src/sq-usage.rs | 6 | ||||
| -rw-r--r-- | sq/src/sq.rs | 2 | ||||
| -rw-r--r-- | sq/src/sq_cli.rs | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/sq/src/sq-usage.rs b/sq/src/sq-usage.rs index f2a4e121..3c9d7d50 100644 --- a/sq/src/sq-usage.rs +++ b/sq/src/sq-usage.rs @@ -31,7 +31,7 @@ //! autocrypt Autocrypt support //! keyserver Interacts with keyservers //! wkd Interacts with Web Key Directories -//! enarmor Applies ASCII Armor to a file +//! armor Applies ASCII Armor to a file //! dearmor Removes ASCII Armor from a file //! inspect Inspects a sequence of OpenPGP packets //! packet OpenPGP Packet manipulation @@ -621,13 +621,13 @@ //! <EMAIL_ADDRESS> The email address from which to obtain the WKD URI. //! ``` //! -//! ## Subcommand enarmor +//! ## Subcommand armor //! //! ```text //! Applies ASCII Armor to a file //! //! USAGE: -//! sq enarmor [OPTIONS] [FILE] +//! sq armor [OPTIONS] [FILE] //! //! FLAGS: //! -h, --help Prints help information diff --git a/sq/src/sq.rs b/sq/src/sq.rs index 8f13deb3..8f58d176 100644 --- a/sq/src/sq.rs +++ b/sq/src/sq.rs @@ -367,7 +367,7 @@ fn main() -> Result<()> { &mut output, signatures, certs)?; }, - ("enarmor", Some(m)) => { + ("armor", Some(m)) => { let mut input = open_or_stdin(m.value_of("input"))?; let mut output = create_or_stdout_pgp(m.value_of("output"), force, diff --git a/sq/src/sq_cli.rs b/sq/src/sq_cli.rs index 1e518d08..692a1937 100644 --- a/sq/src/sq_cli.rs +++ b/sq/src/sq_cli.rs @@ -193,7 +193,7 @@ pub fn configure(app: App<'static, 'static>) -> App<'static, 'static> { (can be given multiple times)")) ) - .subcommand(SubCommand::with_name("enarmor") + .subcommand(SubCommand::with_name("armor") .display_order(500) .about("Applies ASCII Armor to a file") .arg(Arg::with_name("input") |