ambrose
/
env
mirror of https://github.com/serverwentdown/env.git
1
0
Fork 0
Code Releases Activity

Add pinentry-mac fixes

main
Ambrose Chua 2021-03-16 14:44:49 +08:00
parent 23085bf64e
commit 272d8312d9
1 changed files with 27 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
.zshrc
View File

@ -311,20 +311,32 @@ function theme {
setup_prompt
}
if [[ -z "$SSH_CLIENT" ]] && [[ -f "$(which gpgconf 2>/dev/null)" ]]; then
# use gpg agent for SSH if not connected over SSH
export SSH_AUTH_SOCK="$(gpgconf --list-dirs agent-ssh-socket)"
fi
if ! [[ -S "$SSH_AUTH_SOCK" ]]; then
# start gpg agent for SSH access
gpg-connect-agent /bye >/dev/null 2>&1
if [[ -f "$(which gpgconf 2>/dev/null)" ]]; then
if [[ -z "$SSH_CLIENT" ]] || [[ -z "$SSH_AUTH_SOCK" ]]; then
# use gpg agent for SSH if not connected over SSH
export SSH_AUTH_SOCK="$(gpgconf --list-dirs agent-ssh-socket)"
fi
if ! [[ -S "$SSH_AUTH_SOCK" ]]; then
# start gpg agent for SSH access
gpg-connect-agent /bye >/dev/null 2>&1
fi
if [[ $PLATFORM == macos ]] && [[ -f "$(which pinentry-mac 2>/dev/null)" ]]; then
# if pinentry-mac exists and not linked, relink
if [[ "$(readlink /usr/local/bin/pinentry)" != "/usr/local/bin/pinentry-mac" ]]; then
ln -fs /usr/local/bin/pinentry-mac /usr/local/bin/pinentry
echo "Notice: Linked pinentry to pinentry-mac. Undo with:"
echo " brew unlink pinentry && brew link --overwrite pinentry"
fi
fi
function gpg_kill {
# just in case
gpgconf --kill gpg-agent
}
function gpg_tty {
# put gpg pinentry on this tty
export GPG_TTY="$(tty)"
echo UPDATESTARTUPTTY | gpg-connect-agent >/dev/null 2>&1
}
fi
function gpg_kill {
gpgconf --kill gpg-agent
}
function gpg_tty {
# put gpg pinentry on this tty
export GPG_TTY="$(tty)"
echo UPDATESTARTUPTTY | gpg-connect-agent >/dev/null 2>&1
}