wilderjds
/
oh-my-zsh
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
master
Carlo Sala 7 months ago committed by GitHub
parent 5a282b9b30
commit 9d93dfaa60
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 3 additions and 2 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 5
      plugins/keychain/keychain.plugin.zsh

5
plugins/keychain/keychain.plugin.zsh
Unescape 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

Write Preview
Loading…
Cancel
Save