summaryrefslogtreecommitdiff
path: root/plugins
diff options
context:
space:
mode:
Diffstat (limited to 'plugins')
-rw-r--r--plugins/ssh-agent/README.md9
-rw-r--r--plugins/ssh-agent/ssh-agent.plugin.zsh12
2 files changed, 16 insertions, 5 deletions
diff --git a/plugins/ssh-agent/README.md b/plugins/ssh-agent/README.md
index f46e8bf6a..d1a504b1e 100644
--- a/plugins/ssh-agent/README.md
+++ b/plugins/ssh-agent/README.md
@@ -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
```
+**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.
diff --git a/plugins/ssh-agent/ssh-agent.plugin.zsh b/plugins/ssh-agent/ssh-agent.plugin.zsh
index 2049145fd..c2b9546a2 100644
--- a/plugins/ssh-agent/ssh-agent.plugin.zsh
+++ b/plugins/ssh-agent/ssh-agent.plugin.zsh
@@ -23,12 +23,12 @@ function _start_agent() {
}
function _add_identities() {
- local id line sig lines
+ local id file line sig lines
local -a identities loaded_sigs loaded_ids not_loaded
zstyle -a :omz:plugins:ssh-agent identities identities
# check for .ssh folder presence
- if [[ ! -d $HOME/.ssh ]]; then
+ if [[ ! -d "$HOME/.ssh" ]]; then
return
fi
@@ -52,10 +52,12 @@ function _add_identities() {
# add identities if not already loaded
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
- if [[ ${loaded_ids[(I)$HOME/.ssh/$id]} -le 0 ]]; then
- sig="$(ssh-keygen -lf "$HOME/.ssh/$id" | awk '{print $2}')"
- [[ ${loaded_sigs[(I)$sig]} -le 0 ]] && not_loaded+=("$HOME/.ssh/$id")
+ if [[ ${loaded_ids[(I)$file]} -le 0 ]]; then
+ sig="$(ssh-keygen -lf "$file" | awk '{print $2}')"
+ [[ ${loaded_sigs[(I)$sig]} -le 0 ]] && not_loaded+=("$file")
fi
done