changeset 62:16d8d652fcf1

Automated merge with https://localhost/hg/zsh-env
author Dirk Olmes <dirk@xanthippe.ping.de>
date Wed, 04 Feb 2015 02:56:28 +0100
parents 582fde73557e (current diff) 37fb3d013086 (diff)
children a543849b6888 9222611c7a2e
files
diffstat 1 files changed, 9 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/zshrc-xanthippe	Wed Feb 04 02:21:39 2015 +0100
+++ b/zshrc-xanthippe	Wed Feb 04 02:56:28 2015 +0100
@@ -2,9 +2,15 @@
 # zshrc for xanthippe
 #
 
-. $HOME/.zsh-env/zshrc-jdk
-. $HOME/.zsh-env/zshrc-maven
-. $HOME/.zsh-env/zshrc-bindkey
+. ${HOME}/.zsh-env/zshrc-jdk
+. ${HOME}/.zsh-env/zshrc-maven
+. ${HOME}/.zsh-env/zshrc-bindkey
+
+GPG_AGENT_FILE="${HOME}/.gnupg/.gpg-agent-info"
+if [ -f "${GPG_AGENT_FILE}" ]; then
+    . "${GPG_AGENT_FILE}"
+    export GPG_AGENT_INFO
+fi
 
 export GPG_TTY=`tty`
 export PATH="$HOME/bin:${PATH}"