linux/ohmyzsh
1
0
Fork 0
mirror of https://github.com/ohmyzsh/ohmyzsh.git synced 2026-01-23 02:35:38 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

[#13106] Update keychain plugin

Browse source 
Keychain versions 2.9.0 and higher removed support for the --agents option and squawk in console constantly if the option isn't removed, now we check to make sure that the keychain version is less than 2.9.0 before passing the argument
This commit is contained in:
Zachary Craig 2025-06-27 11:27:47 -04:00
commit 45b81ba237
1 changed files with 12 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -19,8 +19,18 @@ function {
# load additional options
zstyle -a :omz:plugins:keychain options options
# start keychain...
keychain ${^options:-} --agents ${agents:-gpg} ${^identities} --host $SHORT_HOST
# 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 -a version_parts=(${(s:.:)version_string})
local major=${version_parts[1]:-0}
local minor=${version_parts[2]:-0}
# start keychain, only use --agents for versions below 2.9.0
if (( major < 2 || (major == 2 && minor < 9) )); then
keychain ${^options:-} --agents ${agents:-gpg} ${^identities} --host $SHORT_HOST
else
keychain ${^options:-} ${^identities} --host $SHORT_HOST
fi
# Get the filenames to store/lookup the environment from
_keychain_env_sh="$HOME/.keychain/$SHORT_HOST-sh"