feat(ssh-copy-id,ssh-keygen): prefer ssh from same dir

scop · scop · commit 5c1d2701456e · 2023-05-22T13:22:01.000+03:00
diff --git a/completions/ssh-copy-id b/completions/ssh-copy-id
@@ -5,6 +5,10 @@ _comp_cmd_ssh_copy_id()
     local cur prev words cword comp_args
     _comp_initialize -- "$@" || return
 
+    # Prefer `ssh` from same dir for resolving options, etc
+    local pathcmd
+    pathcmd=$(type -P "$1") && local PATH=${pathcmd%/*}:$PATH
+
     _comp_xfunc ssh suboption_check && return
 
     case $prev in
diff --git a/completions/ssh-keygen b/completions/ssh-keygen
@@ -99,6 +99,9 @@ _comp_cmd_ssh_keygen()
             return
             ;;
         -*t)
+            # Prefer `ssh` from same dir for resolving options, etc
+            local pathcmd
+            pathcmd=$(type -P "$1") && local PATH=${pathcmd%/*}:$PATH
             local protocols=$(_comp_xfunc ssh query protocol-version)
             local types='dsa ecdsa ecdsa-sk ed25519 ed25519-sk rsa'
             if [[ $protocols == *1* ]]; then
