zshenv: fix _sev_setpath

[dotfiles.git] / bin / pinentry

diff --git a/bin/pinentry b/bin/pinentry
index 7b83ff5d3be433d12a3f167a3997d5cb9f258696..39349d58b9f26509a6eaad6dab622cf2f49eb25c 100755 (executable)
--- a/bin/pinentry
+++ b/bin/pinentry
@@ -1,16 +1,17 @@
 #!/bin/sh
 # https://kevinlocke.name/bits/2019/07/31/prefer-terminal-for-gpg-pinentry
 
 #!/bin/sh
 # https://kevinlocke.name/bits/2019/07/31/prefer-terminal-for-gpg-pinentry
 

-set -Ce
-graphics="gtk-2 gtk qt x11 gnome"
-tty="curses tty"
+set -C
+gfx="gnome qt gtk-4 gtk-3 gtk-2 gtk bemenu dmenu x11"
+tty="curses-ss curses tty"

 case "${PINENTRY_USER_DATA-}" in
 case "${PINENTRY_USER_DATA-}" in

-       *USE_TTY=1*) list="$tty $graphics";;
-       *)           list="$graphics $tty";;
+       # prefer tty unless USE_TTY is 0
+       *USE_TTY=0*) list="$gfx $tty";;
+       *)           list="$tty $gfx";;

 esac
 
 for x in $list; do
 esac
 
 for x in $list; do

-       p=which "pinentry-$x" 2>/dev/null
+       p=$(command -v "pinentry-$x")

        if [ $? = 0 ]; then
                exec "$p" "$@"
        fi
        if [ $? = 0 ]; then
                exec "$p" "$@"
        fi