aboutsummaryrefslogtreecommitdiff
path: root/keychain/shrc.d/keychain.sh
diff options
context:
space:
mode:
authorTom Ryder <tom@sanctum.geek.nz>2017-11-01 13:15:45 +1300
committerTom Ryder <tom@sanctum.geek.nz>2017-11-01 13:15:45 +1300
commitf250d617cb43d53ff78ded1f5d73c94c0e1f3b46 (patch)
tree219fca42e4a1e1b4feb751733bbd5252c1f4f11b /keychain/shrc.d/keychain.sh
parentMerge branch 'hotfix/v0.3.1' (diff)
parentAlways set GPG_TTY regardless of GPG_AGENT_INFO (diff)
downloaddotfiles-dc47437a1f2e3279ff3c3ff115d093eacc58a0a1.tar.gz (sig)
dotfiles-dc47437a1f2e3279ff3c3ff115d093eacc58a0a1.zip
Merge branch 'hotfix/v0.3.2'v0.3.2
* hotfix/v0.3.2: Always set GPG_TTY regardless of GPG_AGENT_INFO Bump version number to 0.3.2
Diffstat (limited to 'keychain/shrc.d/keychain.sh')
-rw-r--r--keychain/shrc.d/keychain.sh3
1 files changed, 1 insertions, 2 deletions
diff --git a/keychain/shrc.d/keychain.sh b/keychain/shrc.d/keychain.sh
index 9a732384..1c0e780e 100644
--- a/keychain/shrc.d/keychain.sh
+++ b/keychain/shrc.d/keychain.sh
@@ -1,4 +1,3 @@
-# If GPG_AGENT_INFO is set, update GPG_TTY for clean use of pinentry(1) etc
-[ -n "$GPG_AGENT_INFO" ] || return
+# Update GPG_TTY for clean use of pinentry(1) etc
GPG_TTY=$(command -p tty) || return
export GPG_TTY