linux/ohmyzsh
Watch
1
0
Fork
You've already forked ohmyzsh
 0
mirror of https://github.com/ohmyzsh/ohmyzsh.git synced 2026-08-07 06:08:39 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

feat(keychain): add version handling (#13898)

Browse source 
Co-authored-by: Carlo Sala <carlosalag@protonmail.com>
This commit is contained in:
FiNeXdesign 2026-08-05 16:22:17 +00:00 • committed by GitHub
commit 7e2aa2c8cb
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 46 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

29
plugins/keychain/keychain.plugin.zsh
View file

@ -4,14 +4,11 @@
SHORT_HOST=${SHORT_HOST:-${(%):-%m}} SHORT_HOST=${SHORT_HOST:-${(%):-%m}}
function { function {
local agents
local -a identities local -a identities
local -a options local -a options
local _keychain_env_sh local _keychain_env_sh
local _keychain_env_sh_gpg local _keychain_env_sh_gpg
local version_string major
# load agents to start.
zstyle -s :omz:plugins:keychain agents agents
# load identities to manage. # load identities to manage.
zstyle -a :omz:plugins:keychain identities identities zstyle -a :omz:plugins:keychain identities identities
@ -19,16 +16,32 @@ function {
# load additional options # load additional options
zstyle -a :omz:plugins:keychain options options zstyle -a :omz:plugins:keychain options options
# Check keychain version to decide whether to use --agents # Detect major version robustly: case-insensitive, tolerant of
local version_string=$(keychain --version 2>&1) # "keychain 3.0.0_beta3" / "Keychain 3.0.0" / etc.
# start keychain, only use --agents for versions below 2.9.0 version_string=$(keychain --version 2>&1)
if [[ "${version_string:l}" =~ '([0-9]+)\.[0-9]+' ]]; then
major=${match[1]}
else
major=2
fi
if (( major >= 3 )); then
# Keychain 3.x: subcommand-based CLI, no --agents.
keychain add ${^options:-} --host $SHORT_HOST ${^identities}
else
local agents
# load agents to start (only used by keychain < 2.9).
zstyle -s :omz:plugins:keychain agents agents
autoload -Uz is-at-least autoload -Uz is-at-least
if [[ "$version_string" =~ 'keychain ([0-9]+\.[0-9]+)' ]] && \ if [[ "${version_string:l}" =~ 'keychain ([0-9]+\.[0-9]+)' ]] && \
is-at-least 2.9 "$match[1]"; then 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
fi fi
fi
# Get the filenames to store/lookup the environment from # Get the filenames to store/lookup the environment from
_keychain_env_sh="$HOME/.keychain/$SHORT_HOST-sh" _keychain_env_sh="$HOME/.keychain/$SHORT_HOST-sh"