diff options
| author | Tom Ryder <tom@sanctum.geek.nz> | 2017-11-01 13:16:44 +1300 |
|---|---|---|
| committer | Tom Ryder <tom@sanctum.geek.nz> | 2017-11-01 13:16:44 +1300 |
| commit | b02dd405c4397e2caaf343b29017681b535d824e (patch) | |
| tree | 219fca42e4a1e1b4feb751733bbd5252c1f4f11b | |
| parent | Merge branch 'hotfix/v0.3.1' into develop (diff) | |
| parent | Always set GPG_TTY regardless of GPG_AGENT_INFO (diff) | |
| download | dotfiles-b02dd405c4397e2caaf343b29017681b535d824e.tar.gz dotfiles-b02dd405c4397e2caaf343b29017681b535d824e.zip | |
Merge branch 'hotfix/v0.3.2' into develop
* hotfix/v0.3.2:
Always set GPG_TTY regardless of GPG_AGENT_INFO
Bump version number to 0.3.2
| -rw-r--r-- | VERSION | 4 | ||||
| -rw-r--r-- | keychain/shrc.d/keychain.sh | 3 |
2 files changed, 3 insertions, 4 deletions
@@ -1,2 +1,2 @@ -tejr dotfiles v0.3.1 -Tue Oct 31 21:05:17 UTC 2017 +tejr dotfiles v0.3.2 +Wed Nov 1 13:11:51 NZDT 2017 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 |