diff options
Diffstat (limited to 'gpg-agent.sh')
| -rwxr-xr-x | gpg-agent.sh | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/gpg-agent.sh b/gpg-agent.sh index cd8a866..ac6d385 100755 --- a/gpg-agent.sh +++ b/gpg-agent.sh @@ -11,18 +11,18 @@ # starting multiple agents #---------------------------------------------------- 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 - eval $(cat ${envfile}) + [[ -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 + eval $(< ${envfile}) else - eval `/usr/bin/gpg-agent --daemon --enable-ssh-support --write-env-file ${envfile}` - fi - export GPG_AGENT_INFO - export SSH_AUTH_SOCK - export SSH_AGENT_PID + eval `/usr/bin/gpg-agent --daemon --enable-ssh-support --write-env-file ${envfile}` + fi + export GPG_AGENT_INFO + export SSH_AUTH_SOCK + export SSH_AGENT_PID } if [[ -n $DISPLAY ]]; then |