From 0ed692de099e9e9ecfdacc9569dc9e55b8612ca8 Mon Sep 17 00:00:00 2001
From: Berend de Boer <berend@pobox.com>
Date: Fri, 4 Oct 2019 16:37:13 +1300
Subject: [PATCH 1/2] Use ssh-add to check if agent is started as ps does not
 always work

---
 functions/__ssh_agent_is_started.fish | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/functions/__ssh_agent_is_started.fish b/functions/__ssh_agent_is_started.fish
index 882c8f0..e507614 100644
--- a/functions/__ssh_agent_is_started.fish
+++ b/functions/__ssh_agent_is_started.fish
@@ -7,6 +7,8 @@ function __ssh_agent_is_started -d "check if ssh agent is already started"
 		return 1
 	end
 
-	ps -ef | grep $SSH_AGENT_PID | grep -v grep | grep -q ssh-agent
-	return $status
+	ssh-add -l > /dev/null
+	if [ $status -eq 2 ]
+	    return 1
+	end
 end

From 636516f348cc160f3526f23260d0edafca10f86e Mon Sep 17 00:00:00 2001
From: Berend de Boer <berend@pobox.com>
Date: Sat, 5 Oct 2019 09:53:53 +1300
Subject: [PATCH 2/2] Tabify, redirect stderr to null, and use test

---
 functions/__ssh_agent_is_started.fish | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/functions/__ssh_agent_is_started.fish b/functions/__ssh_agent_is_started.fish
index e507614..db14558 100644
--- a/functions/__ssh_agent_is_started.fish
+++ b/functions/__ssh_agent_is_started.fish
@@ -1,5 +1,5 @@
 function __ssh_agent_is_started -d "check if ssh agent is already started"
-  	if begin; test -f $SSH_ENV; and test -z "$SSH_AGENT_PID"; end
+	if begin; test -f $SSH_ENV; and test -z "$SSH_AGENT_PID"; end
 		source $SSH_ENV > /dev/null
 	end
 
@@ -7,8 +7,8 @@ function __ssh_agent_is_started -d "check if ssh agent is already started"
 		return 1
 	end
 
-	ssh-add -l > /dev/null
-	if [ $status -eq 2 ]
-	    return 1
+	ssh-add -l > /dev/null 2>&1
+	if test $status -eq 2
+		return 1
 	end
 end