From 8cea44ecc481c7774259660422f4df68076f8a17 Mon Sep 17 00:00:00 2001
From: Gardouille <gardouille@gmail.com>
Date: Mon, 27 Sep 2021 16:50:53 +0200
Subject: [PATCH] Fix condition to launch ssh-agent

---
 zshrc | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/zshrc b/zshrc
index 500d97d..333ba66 100644
--- a/zshrc
+++ b/zshrc
@@ -323,18 +323,19 @@ alias josm="java -jar -Xmx2048M /opt/josm-tested.jar"
 ##   1. in zlogin (for a new shell)
 ##   2. with recossh alias to load a new ssh-agent
 function load-ssh-agent() {
-	## If a ssh-key is available
-	##   AND ssh-agent not launched
-	if find "${HOME}/.ssh" -maxdepth 1 -type f -iname "id_*" > /dev/null 2>&1 &&
-	   ! ps -x | grep -v grep | grep -Fq -- "ssh-agent -a ${SSH_AGENT_SOCK}"; then
-		### Remove any previous socket and environment files
-		rm --force -- "${SSH_AGENT_SOCK}" "${SSH_AGENT_ENV}"
-		### Start ssh-agent with a specified socket path
-		###   AND store informations in a file
-		ssh-agent -a "${SSH_AGENT_SOCK}" > "${SSH_AGENT_ENV}"
+	# If a ssh-key is available
+	if find "${HOME}/.ssh" -maxdepth 1 -type f -iname "id_*" | grep -q -- .; then
+		## If ssh-agent is not already launched
+		if ! ps -x | grep -v grep | grep -Fq -- "ssh-agent -a ${SSH_AGENT_SOCK}"; then
+			### Remove any previous socket and environment files
+			rm --force -- "${SSH_AGENT_SOCK}" "${SSH_AGENT_ENV}"
+			### Start ssh-agent with a specified socket path
+			###   AND store informations in a file
+			ssh-agent -a "${SSH_AGENT_SOCK}" > "${SSH_AGENT_ENV}"
+		fi
+		## Load content of ssh-agent environment file
+		source "${SSH_AGENT_ENV}"
 	fi
-	## Load content of ssh-agent environment file
-	source "${SSH_AGENT_ENV}"
 }
 # }}}
 # Add ed25519 ssh-key to ssh-agent {{{