user-dirs: fix XDG_PUBLICSHARE_DIR

[dotfiles.git] / bin / pinentry

diff --git a/bin/pinentry b/bin/pinentry
index 7b83ff5d3be433d12a3f167a3997d5cb9f258696..0bd1062bddde4ee4a6b99a7edb1ebf5d682e3397 100755 (executable)
--- a/bin/pinentry
+++ b/bin/pinentry
@@ -2,15 +2,16 @@
 # https://kevinlocke.name/bits/2019/07/31/prefer-terminal-for-gpg-pinentry
 
 set -Ce
-graphics="gtk-2 gtk qt x11 gnome"
+gfx="gnome gtk-2 gtk qt x11"
 tty="curses tty"
 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
-       p=which "pinentry-$x" 2>/dev/null
+       p=$(command -v "pinentry-$x") 2>/dev/null
        if [ $? = 0 ]; then
                exec "$p" "$@"
        fi