diff options
author | Aaron LI <aly@aaronly.me> | 2018-02-20 22:34:56 +0800 |
---|---|---|
committer | Aaron LI <aly@aaronly.me> | 2018-02-20 22:34:56 +0800 |
commit | 6808da56ad6ecd8c1ebf7ca6a39495df4f7ebbd2 (patch) | |
tree | 80142bdab04ebf9d3de3398e912ffda275556659 /bin | |
parent | 3f80c4abe8f866d6ed730518af2289a51b5097a5 (diff) | |
download | dotfiles-6808da56ad6ecd8c1ebf7ca6a39495df4f7ebbd2.tar.bz2 |
gpg: rewrite gpg-agent handling with zsh
* do not hack to force to use `pinentry-curses` with custom `pinentry`
and `gpg2-x11` shims
* explain to use the `pinentry-gtk-2`, which will fallback to text mode
* simply launch `gpg-agent` with `gpgconf --launch`
Diffstat (limited to 'bin')
-rwxr-xr-x | bin/gpg2-x11 | 18 | ||||
-rwxr-xr-x | bin/pinentry | 34 |
2 files changed, 0 insertions, 52 deletions
diff --git a/bin/gpg2-x11 b/bin/gpg2-x11 deleted file mode 100755 index db0d53f..0000000 --- a/bin/gpg2-x11 +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/sh -# -# `gpg2` shim to support force use the graphical pinentry. -# See also: `~/bin/pinentry-app' -# -# Credit: http://blog.mrloop.com/workflow/2017/02/09/pin-entry.html -# -# Aaron LI -# 2018-01-13 -# - - -GPG2=$(which gpg2) -CFG=${XDG_RUNTIME_DIR}/pinentry-app -echo "x11" > ${CFG} -exec ${GPG2} "$@" - -# vim: set ts=8 sw=4 tw=0 fenc=utf-8 ft=sh: # diff --git a/bin/pinentry b/bin/pinentry deleted file mode 100755 index 524bc59..0000000 --- a/bin/pinentry +++ /dev/null @@ -1,34 +0,0 @@ -#!/bin/sh -# -# PINentry shim to support both terminal and graphical usages. -# -# Credit: http://blog.mrloop.com/workflow/2017/02/09/pin-entry.html -# -# Aaron LI -# 2018-01-13 -# - -# GPG2 shim to support force use the graphical pinentry (`~/bin/gpg2-x11`). -# ------------------------------------------------------------------>8 -# #!/bin/sh -# GPG2=$(which gpg2) || exit 1 -# CFG=${XDG_RUNTIME_DIR}/pinentry-app -# echo "x11" > ${CFG} -# exec ${GPG2} "$@" -# ------------------------------------------------------------------>8 - -ENTRY_TERM="curses" # PIN entry variant for terminal (and default) -ENTRY_X11="gtk-2" # for X11 usage - -CFG=${XDG_RUNTIME_DIR}/pinentry-app -TYPE=$([ -f ${CFG} ] && cat ${CFG}) -if [ -n "${TYPE}" ] && [ "${TYPE}" = "x11" ]; then - ENTRY="${ENTRY_X11}" -else - ENTRY="${ENTRY_TERM}" -fi - -PINENTRY=$(which "pinentry-${ENTRY}") || exit 1 -exec ${PINENTRY} "$@" - -# vim: set ts=8 sw=4 tw=0 fenc=utf-8 ft=sh: # |