summaryrefslogtreecommitdiffstats
path: root/gpg-agent.sh
diff options
context:
space:
mode:
authorFlorian Pritz <bluewind@xinu.at>2013-07-11 21:30:50 +0200
committerFlorian Pritz <bluewind@xinu.at>2013-07-11 21:30:50 +0200
commit2ff97fcfcefb6ef96a2bc1a45fb85648430e2b5c (patch)
tree1b4c86cf35e4d08fd32c099159f8325c8f9a440d /gpg-agent.sh
parentf8ba9af8da1ce2570a50b7adadf67742829c71bf (diff)
downloadbin-2ff97fcfcefb6ef96a2bc1a45fb85648430e2b5c.tar.gz
bin-2ff97fcfcefb6ef96a2bc1a45fb85648430e2b5c.tar.xz
gpg-agent.sh: get rid of cat; fix indentation
Signed-off-by: Florian Pritz <bluewind@xinu.at>
Diffstat (limited to 'gpg-agent.sh')
-rwxr-xr-xgpg-agent.sh22
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