tool: Emit armored data by default.

3 files changed, 18 insertions, 18 deletions

diff --git a/tool/src/cli.rs b/tool/src/cli.rs
index 098aa6e8..2fe96b13 100644
--- a/tool/src/cli.rs
+++ b/tool/src/cli.rs
@@ -44,10 +44,10 @@ pub fn build() -> App<'static, 'static> {
                          .long("output")
                          .short("o")
                          .help("Sets the output file to use"))
-                    .arg(Arg::with_name("armor")
-                         .long("armor")
-                         .short("A")
-                         .help("Write armored data to file"))
+                    .arg(Arg::with_name("binary")
+                         .long("binary")
+                         .short("B")
+                         .help("Emit unencoded OpenPGP data"))
                     .arg(Arg::with_name("recipient")
                          .long("recipient")
                          .short("r")
@@ -133,10 +133,10 @@ pub fn build() -> App<'static, 'static> {
                                      .long("output")
                                      .short("o")
                                      .help("Sets the output file to use"))
-                                .arg(Arg::with_name("armor")
-                                     .long("armor")
-                                     .short("A")
-                                     .help("Write armored data to file"))
+                                .arg(Arg::with_name("binary")
+                                     .long("binary")
+                                     .short("B")
+                                     .help("Emit unencoded OpenPGP data"))
                                 .arg(Arg::with_name("keyid").value_name("KEYID")
                                      .required(true)
                                      .help("ID of the key to retrieve")))
@@ -176,10 +176,10 @@ pub fn build() -> App<'static, 'static> {
                                      .long("output")
                                      .short("o")
                                      .help("Sets the output file to use"))
-                                .arg(Arg::with_name("armor")
-                                     .long("armor")
-                                     .short("A")
-                                     .help("Write armored data to file")))
+                                .arg(Arg::with_name("binary")
+                                     .long("binary")
+                                     .short("B")
+                                     .help("Emit unencoded OpenPGP data")))
                     .subcommand(SubCommand::with_name("delete")
                                 .about("Deletes bindings or stores")
                                 .arg(Arg::with_name("the-store")
diff --git a/tool/src/sq-usage.rs b/tool/src/sq-usage.rs
index 37a0c7cd..3a01211a 100644
--- a/tool/src/sq-usage.rs
+++ b/tool/src/sq-usage.rs
@@ -145,7 +145,7 @@
 //!     sq encrypt [FLAGS] [OPTIONS]
 //!
 //! FLAGS:
-//!     -A, --armor        Write armored data to file
+//!     -B, --binary       Emit unencoded OpenPGP data
 //!     -h, --help         Prints help information
 //!     -s, --symmetric    Encrypt with a password (can be given multiple times)
 //!     -V, --version      Prints version information
@@ -186,7 +186,7 @@
 //!     sq keyserver get [FLAGS] [OPTIONS] <KEYID>
 //!
 //! FLAGS:
-//!     -A, --armor      Write armored data to file
+//!     -B, --binary     Emit unencoded OpenPGP data
 //!     -h, --help       Prints help information
 //!     -V, --version    Prints version information
 //!
@@ -375,7 +375,7 @@
 //!     sq store export [FLAGS] [OPTIONS] <LABEL>
 //!
 //! FLAGS:
-//!     -A, --armor      Write armored data to file
+//!     -B, --binary     Emit unencoded OpenPGP data
 //!     -h, --help       Prints help information
 //!     -V, --version    Prints version information
 //!
diff --git a/tool/src/sq.rs b/tool/src/sq.rs
index 5ecf8a7d..8e277227 100644
--- a/tool/src/sq.rs
+++ b/tool/src/sq.rs
@@ -73,7 +73,7 @@ fn real_main() -> Result<(), failure::Error> {
         ("encrypt",  Some(m)) => {
             let mut input = open_or_stdin(m.value_of("input"))?;
             let mut output = create_or_stdout(m.value_of("output"))?;
-            let mut output = if m.is_present("armor") {
+            let mut output = if ! m.is_present("binary") {
                 Box::new(armor::Writer::new(&mut output,
                                             armor::Kind::Message))
             } else {
@@ -156,7 +156,7 @@ fn real_main() -> Result<(), failure::Error> {
                     let id = id.unwrap();
 
                     let mut output = create_or_stdout(m.value_of("output"))?;
-                    let mut output = if m.is_present("armor") {
+                    let mut output = if ! m.is_present("binary") {
                         Box::new(armor::Writer::new(&mut output, armor::Kind::PublicKey))
                     } else {
                         output
@@ -207,7 +207,7 @@ fn real_main() -> Result<(), failure::Error> {
                     let tpk = store.lookup(m.value_of("label").unwrap())?.tpk()?;
 
                     let mut output = create_or_stdout(m.value_of("output"))?;
-                    let mut output = if m.is_present("armor") {
+                    let mut output = if ! m.is_present("binary") {
                         Box::new(armor::Writer::new(&mut output, armor::Kind::PublicKey))
                     } else {
                         output