Cornelicorn/oh-my-zsh
1
0
Fork 0
mirror of https://github.com/robbyrussell/oh-my-zsh.git synced 2025-12-06 15:30:40 +01:00
Code Issues Releases Wiki Activity

fix(keychain): use pattern matching to detect version (#13423)

Browse Source
This commit is contained in:
Carlo Sala
2025-11-15 11:39:09 -03:00
committed by GitHub
parent 5a282b9b30
commit 9d93dfaa60
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
plugins/keychain/keychain.plugin.zsh
View File

@@ -20,10 +20,11 @@ function {
zstyle -a :omz:plugins:keychain options options zstyle -a :omz:plugins:keychain options options
# Check keychain version to decide whether to use --agents # Check keychain version to decide whether to use --agents
local version_string=$(keychain --version 2>&1 | head -n 2 | tail -n 1 | cut -d ' ' -f 4) local version_string=$(keychain --version 2>&1)
# start keychain, only use --agents for versions below 2.9.0 # start keychain, only use --agents for versions below 2.9.0
autoload -Uz is-at-least autoload -Uz is-at-least
if is-at-least 2.9 "$version_string"; then if [[ "$version_string" =~ 'keychain ([0-9]+\.[0-9]+)' ]] && \
is-at-least 2.9 "$match[1]"; then
keychain ${^options:-} ${^identities} --host $SHORT_HOST keychain ${^options:-} ${^identities} --host $SHORT_HOST
else else
keychain ${^options:-} --agents ${agents:-gpg} ${^identities} --host $SHORT_HOST keychain ${^options:-} --agents ${agents:-gpg} ${^identities} --host $SHORT_HOST