aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuilhem Moulin <guilhem@fripost.org>2015-03-31 22:14:34 +0200
committerGuilhem Moulin <guilhem@fripost.org>2015-03-31 22:14:34 +0200
commit020ac04b7f743b707538fd40ae85ee862cdc31ec (patch)
tree5255e3f0285930adff31d3a04d59116dee120afd
parente27989d46022f18d7937017a1f41f05c4378fe3a (diff)
Add --quiet to the default gpg options.
-rwxr-xr-xcli/icevault2
-rw-r--r--cli/icevault.14
2 files changed, 3 insertions, 3 deletions
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