aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Ryder <tom@sanctum.geek.nz>2017-12-29 13:03:21 +1300
committerTom Ryder <tom@sanctum.geek.nz>2017-12-29 13:03:21 +1300
commit3f8e8f74a0808eea59a9648f66e476d58d09b622 (patch)
tree4d732fcde65a9596cfb10b8ca888f7a96031ef68
parentMerge branch 'release/v0.21.0' into develop (diff)
parentRemove --batch option and wrapper for gpg(1) (diff)
downloaddotfiles-3f8e8f74a0808eea59a9648f66e476d58d09b622.tar.gz
dotfiles-3f8e8f74a0808eea59a9648f66e476d58d09b622.zip
Merge branch 'feature/gpg-no-batch' into develop
* feature/gpg-no-batch: Remove --batch option and wrapper for gpg(1)
-rw-r--r--README.md1
-rw-r--r--gnupg/gpg.conf.mi55
-rw-r--r--sh/shrc.d/gpg.sh10
3 files changed, 0 insertions, 16 deletions
diff --git a/README.md b/README.md
index 3e602d65..e8b67350 100644
--- a/README.md
+++ b/README.md
@@ -205,7 +205,6 @@ in `sh/shrc.d` to be loaded by any POSIX interactive shell. Those include:
* `ed()` tries to get verbose error messages, a prompt, and a Readline
environment for `ed(1)`.
* `gdb()` silences startup messages from `gdb(1)`.
-* `gpg()` quietens `gpg(1)` down for most commands.
* `grep()` tries to apply color and other options good for interactive use if
available.
* `hgrep()` allows searching `$HISTFILE`.
diff --git a/gnupg/gpg.conf.mi5 b/gnupg/gpg.conf.mi5
index 1617a979..74363441 100644
--- a/gnupg/gpg.conf.mi5
+++ b/gnupg/gpg.conf.mi5
@@ -1,11 +1,6 @@
# Retrieve certs automatically if possible
auto-key-locate cert pka
-# Prevent boilerplate about needing key decryption, which is handled by the
-# agent; the gpg function in my Bash scripts overrides this for certain
-# commands where it interferes
-batch
-
# Use SHA512 as the hash when making key signatures
cert-digest-algo SHA512
diff --git a/sh/shrc.d/gpg.sh b/sh/shrc.d/gpg.sh
deleted file mode 100644
index 62d123ea..00000000
--- a/sh/shrc.d/gpg.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-# Wrapper around gpg(1) to stop ``--batch'' breaking things
-gpg() {
- # shellcheck disable=SC2048
- case $* in
- *--ed*|*--gen-k*|*--sign-k*)
- set -- --no-batch "$@"
- ;;
- esac
- command gpg "$@"
-}