mirror of
https://github.com/ohmyzsh/ohmyzsh.git
synced 2024-11-18 03:40:08 +00:00
feat(ssh-agent): allow specifying absolute path to identities
Fixes #9650
This commit is contained in:
parent
0c590aba74
commit
4a69ee575c
2 changed files with 16 additions and 5 deletions
|
@ -27,6 +27,15 @@ To **load multiple identities** use the `identities` style, For example:
|
||||||
zstyle :omz:plugins:ssh-agent identities id_rsa id_rsa2 id_github
|
zstyle :omz:plugins:ssh-agent identities id_rsa id_rsa2 id_github
|
||||||
```
|
```
|
||||||
|
|
||||||
|
**NOTE:** the identities may be an absolute path if they are somewhere other than
|
||||||
|
`~/.ssh`. For example:
|
||||||
|
|
||||||
|
```zsh
|
||||||
|
zstyle :omz:plugins:ssh-agent identities ~/.config/ssh/id_rsa ~/.config/ssh/id_rsa2 ~/.config/ssh/id_github
|
||||||
|
# which can be simplified to
|
||||||
|
zstyle :omz:plugins:ssh-agent identities ~/.config/ssh/{id_rsa,id_rsa2,id_github}
|
||||||
|
```
|
||||||
|
|
||||||
----
|
----
|
||||||
|
|
||||||
To **set the maximum lifetime of the identities**, use the `lifetime` style.
|
To **set the maximum lifetime of the identities**, use the `lifetime` style.
|
||||||
|
|
|
@ -23,12 +23,12 @@ function _start_agent() {
|
||||||
}
|
}
|
||||||
|
|
||||||
function _add_identities() {
|
function _add_identities() {
|
||||||
local id line sig lines
|
local id file line sig lines
|
||||||
local -a identities loaded_sigs loaded_ids not_loaded
|
local -a identities loaded_sigs loaded_ids not_loaded
|
||||||
zstyle -a :omz:plugins:ssh-agent identities identities
|
zstyle -a :omz:plugins:ssh-agent identities identities
|
||||||
|
|
||||||
# check for .ssh folder presence
|
# check for .ssh folder presence
|
||||||
if [[ ! -d $HOME/.ssh ]]; then
|
if [[ ! -d "$HOME/.ssh" ]]; then
|
||||||
return
|
return
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
@ -52,10 +52,12 @@ function _add_identities() {
|
||||||
|
|
||||||
# add identities if not already loaded
|
# add identities if not already loaded
|
||||||
for id in $identities; do
|
for id in $identities; do
|
||||||
|
# if id is an absolute path, make file equal to id
|
||||||
|
[[ "$id" = /* ]] && file="$id" || file="$HOME/.ssh/$id"
|
||||||
# check for filename match, otherwise try for signature match
|
# check for filename match, otherwise try for signature match
|
||||||
if [[ ${loaded_ids[(I)$HOME/.ssh/$id]} -le 0 ]]; then
|
if [[ ${loaded_ids[(I)$file]} -le 0 ]]; then
|
||||||
sig="$(ssh-keygen -lf "$HOME/.ssh/$id" | awk '{print $2}')"
|
sig="$(ssh-keygen -lf "$file" | awk '{print $2}')"
|
||||||
[[ ${loaded_sigs[(I)$sig]} -le 0 ]] && not_loaded+=("$HOME/.ssh/$id")
|
[[ ${loaded_sigs[(I)$sig]} -le 0 ]] && not_loaded+=("$file")
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue