Updating GPG agent's auto-start.

From GPG 2.1, the auto-start mechanism has changed.
https://www.gnupg.org/faq/whats-new-in-2.1.html
This commit is contained in:
Rodolphe Breard 2015-10-02 20:59:51 +02:00
parent 6501871262
commit 3a030059ca
2 changed files with 5 additions and 6 deletions

View file

@ -4,7 +4,7 @@
hash xcompmgr 2>/dev/null && xcompmgr & hash xcompmgr 2>/dev/null && xcompmgr &
hash xscreensaver 2>/dev/null && xscreensaver -no-splash & hash xscreensaver 2>/dev/null && xscreensaver -no-splash &
hash gpg-agent 2>/dev/null && eval $(gpg-agent --daemon --enable-ssh-support --write-env-file "${HOME}/.gpg-agent-info") hash gpg-agent 2>/dev/null && eval $(gpg-agent --daemon --enable-ssh-support)
DEFAULT_SESSION=qtile DEFAULT_SESSION=qtile
[[ ":$PATH:" == *":$HOME/bin:"* ]] || export PATH="$HOME/bin:$PATH" [[ ":$PATH:" == *":$HOME/bin:"* ]] || export PATH="$HOME/bin:$PATH"

9
.zshrc
View file

@ -42,12 +42,11 @@ if [ -f "/usr/share/zsh/plugins/zsh-syntax-highlighting/zsh-syntax-highlighting.
fi fi
# GPG Agent # GPG Agent
if [ -f "${HOME}/.gpg-agent-info" ]; then
. "${HOME}/.gpg-agent-info"
export GPG_AGENT_INFO
export SSH_AUTH_SOCK
fi
export GPG_TTY=$(tty) export GPG_TTY=$(tty)
unset SSH_AGENT_PID
if [ "${gnupg_SSH_AUTH_SOCK_by:-0}" -ne $$ ]; then
export SSH_AUTH_SOCK="${HOME}/.gnupg/S.gpg-agent.ssh"
fi
# Aliases # Aliases
[ "$(uname -s | tr '[:upper:]' '[:lower:]')" = 'linux' ] && alias ls='ls --color=auto' [ "$(uname -s | tr '[:upper:]' '[:lower:]')" = 'linux' ] && alias ls='ls --color=auto'