From c4927a459b2d091641813db1a420bdafaff3b391 Mon Sep 17 00:00:00 2001
From: Guilhem Moulin <guilhem@fripost.org>
Date: Tue, 31 Mar 2015 22:14:34 +0200
Subject: Add --quiet to the default gpg options.

---
 cli/icevault   | 2 +-
 cli/icevault.1 | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'cli')

diff --git a/cli/icevault b/cli/icevault
index 9f58502..7bbc37f 100755
--- a/cli/icevault
+++ b/cli/icevault
@@ -169,7 +169,7 @@ sub loadConfig() {
     error "Insecure C<%s>", $CONFIG{pwgen} unless $CONFIG{pwgen} =~ /\A([-_\@a-zA-Z0-9\.%\/= ]+)\z/;
     $CONFIG{pwgen} = $1;
 
-    $CONFIG{gpg} //= 'gpg';
+    $CONFIG{gpg} //= qw/gpg --quiet/;
     $CONFIG{gpg} =~ s#\A~/#$ENV{HOME}#;
     error "Insecure C<%s>", $CONFIG{gpg} unless $CONFIG{gpg} =~ /\A([-_\@a-zA-Z0-9\.%\/= ]+)\z/;
     $CONFIG{gpg} = $1;
diff --git a/cli/icevault.1 b/cli/icevault.1
index 88c0902..4138348 100644
--- a/cli/icevault.1
+++ b/cli/icevault.1
@@ -101,7 +101,7 @@ echo '*.gpg diff=gpg' >"${XDG_DATA_HOME:-$HOME/.local/share}/icevault/.gitattrib
 \fBicevault git\fR add .gitattributes
 \fBicevault git\fR commit \-m 'Add an attribute for .gpg binary files.'
 \fBicevault git\fR config diff.gpg.binary true
-\fBicevault git\fR config diff.gpg.textconv 'gpg \-o \- \-\-decrypt \-\-'
+\fBicevault git\fR config diff.gpg.textconv 'gpg \-qo \- \-\-decrypt \-\-'
 .RE
 .fi
 
@@ -207,7 +207,7 @@ option).
 .I gpg
 The \fIgpg\fR(1) command to use.  Users of GnuPG 1.4.x will probably
 want to add the \fB--use-agent\fR and possibly \fB--batch\fR options.
-(Default: \(lqgpg\(rq.)
+(Default: \(lqgpg \-\-quiet\(rq.)
 
 .TP
 .I keyid
-- 
cgit v1.2.3