From 28c00e2d22c0288ad8eced897b4966046742d5ff Mon Sep 17 00:00:00 2001 From: Florian Pritz Date: Wed, 6 Aug 2014 13:30:28 +0200 Subject: gpg-agent.ssh: use standard socket (default in arch linux now) Signed-off-by: Florian Pritz --- gpg-agent.sh | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) (limited to 'gpg-agent.sh') diff --git a/gpg-agent.sh b/gpg-agent.sh index 067d73f..801c40b 100755 --- a/gpg-agent.sh +++ b/gpg-agent.sh @@ -11,18 +11,12 @@ #---------------------------------------------------- initgpg(){ [[ -z $XDG_CONFIG_HOME ]] && XDG_CONFIG_HOME="$HOME/.config" - [[ -z $XDG_DATA_HOME ]] && XDG_DATA_HOME="$HOME/.local/share" [ -f "$XDG_CONFIG_HOME/disable-gpg-agent" ] && return 0 - envfile="${XDG_DATA_HOME}/.gpginfo" - if test -f ${envfile} && test -S $(cut -d= -f 2 ${envfile} | head -n 2 | tail -n 1) 2>/dev/null; then - . ${envfile} - else - /usr/bin/gpg-agent --daemon --enable-ssh-support --write-env-file ${envfile} - . ${envfile} + if [[ ! -S "$HOME/.gnupg/S.gpg-agent.ssh" ]]; then + pkill gpg-agent + /usr/bin/gpg-agent --daemon --enable-ssh-support --use-standard-socket >/dev/null fi - export GPG_AGENT_INFO - export SSH_AUTH_SOCK - export SSH_AGENT_PID + export SSH_AUTH_SOCK=$HOME/.gnupg/S.gpg-agent.ssh } if [[ -n $DISPLAY ]]; then -- cgit v1.2.3-24-g4f1b