9d93dfaa60ccc7980ad69b75b1accae0232e4e8f

 1diff --git a/plugins/keychain/keychain.plugin.zsh b/plugins/keychain/keychain.plugin.zsh
 2index ce5351bcec2dfe3a84a73993cd769afd8a75151e..23cf1af9a8c02dac198251f04ccd0c31f02afe78 100644
 3--- a/plugins/keychain/keychain.plugin.zsh
 4+++ b/plugins/keychain/keychain.plugin.zsh
 5@@ -20,10 +20,11 @@ function {
 6 	zstyle -a :omz:plugins:keychain options options
 7 
 8 	# Check keychain version to decide whether to use --agents
 9-	local version_string=$(keychain --version 2>&1 | head -n 2 | tail -n 1 | cut -d ' ' -f 4)
10+	local version_string=$(keychain --version 2>&1)
11   # start keychain, only use --agents for versions below 2.9.0
12 	autoload -Uz is-at-least
13-	if is-at-least 2.9 "$version_string"; then
14+	if [[ "$version_string" =~ 'keychain ([0-9]+\.[0-9]+)' ]] && \
15+      is-at-least 2.9 "$match[1]"; then
16 		keychain ${^options:-} ${^identities} --host $SHORT_HOST
17 	else
18 		keychain ${^options:-} --agents ${agents:-gpg} ${^identities} --host $SHORT_HOST