From affb735a4913b30a58b114640a385596a20c7b08 Mon Sep 17 00:00:00 2001
From: EuAndreh <eu@euandre.org>
Date: Sun, 22 Apr 2018 19:32:09 -0300
Subject: Move back to old ssh agent config

---
 bash/agents.sh | 21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

(limited to 'bash')

diff --git a/bash/agents.sh b/bash/agents.sh
index 8d7f397..0fd307a 100644
--- a/bash/agents.sh
+++ b/bash/agents.sh
@@ -4,8 +4,19 @@ eval "$(thefuck --alias f)"
 
 export GPG_TTY=$(tty)
 
-if [ -n "$DESKTOP_SESSION" ];then
-    eval $(gnome-keyring-daemon)
-    eval $(gnome-keyring-daemon --start)
-    export SSH_AUTH_SOCK
-fi
+export SSH_ENV="$HOME/.ssh/environment"
+start_agent() {
+    echo "Initialising new SSH agent..."
+    ssh-agent | sed 's/^echo/#echo/' > "${SSH_ENV}"
+    echo succeeded
+    chmod 600 "${SSH_ENV}"
+    . "${SSH_ENV}" > /dev/null
+    ssh-add
+}
+
+[ -f "${SSH_ENV}" ] && {
+    . "${SSH_ENV}" > /dev/null
+    ps -ef | grep ${SSH_AGENT_PID} | grep ssh-agent$ > /dev/null || {
+        start_agent
+    }
+} || start_agent
-- 
cgit v1.2.3