From 6808da56ad6ecd8c1ebf7ca6a39495df4f7ebbd2 Mon Sep 17 00:00:00 2001 From: Aaron LI Date: Tue, 20 Feb 2018 22:34:56 +0800 Subject: 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` --- bin/pinentry | 34 ---------------------------------- 1 file changed, 34 deletions(-) delete mode 100755 bin/pinentry (limited to 'bin/pinentry') 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: # -- cgit v1.2.2