From 1ecd8c5ef097342fa29a4f1758da3fc2848cf5cc Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Sun, 23 Jun 2013 19:39:54 -0500 Subject: [PATCH] Updated OMZ + GPG only on workstations --- lib/mod/agent | 2 +- lib/oh-my-zsh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/mod/agent b/lib/mod/agent index 1651a09..f29379c 100644 --- a/lib/mod/agent +++ b/lib/mod/agent @@ -23,7 +23,7 @@ agent_cmd () { agent_which () { [ "$(hostname -s )" = "fantom" ] && agent_cmd ssh-agent && return 0 agent_cmd gnome-keyring-daemon -c pkcs11,secrets - [ "$SSH_TTY" = "" ] && agent_cmd gpg-agent --daemon --enable-ssh-support && return 0 + info_ws && agent_cmd gpg-agent --daemon --enable-ssh-support && return 0 agent_cmd ssh-agent && return 0 echo "Failed to find an agent" >&2 return 1 diff --git a/lib/oh-my-zsh b/lib/oh-my-zsh index 86a889e..78dba75 160000 --- a/lib/oh-my-zsh +++ b/lib/oh-my-zsh @@ -1 +1 @@ -Subproject commit 86a889ea083d341ba2bc48656008e5af46a3df2d +Subproject commit 78dba754d183804079474aa2b1390bd96cb67583