improved known_hosts completion

[etc/ssh.git] / .zsh / zshrc / parts.d / 50-ssh

diff --git a/.zsh/zshrc/parts.d/50-ssh b/.zsh/zshrc/parts.d/50-ssh
index d872af2cb4813f23aaebb5b4a3dde31e09babc6d..04b9358da5980bb477f90fb2684b0ea07c07ac43 100644 (file)
--- a/.zsh/zshrc/parts.d/50-ssh
+++ b/.zsh/zshrc/parts.d/50-ssh
@@ -11,8 +11,15 @@
 # populate hosts completion with SSH's known_hosts
 if [ -r $HOME/.ssh/known_hosts ]; then
   local _myhosts
 # populate hosts completion with SSH's known_hosts
 if [ -r $HOME/.ssh/known_hosts ]; then
   local _myhosts

-  _myhosts=(${${${${(f)"$(cat $HOME/.ssh/known_hosts)"}:#[0-9]*}%%\ *}%%,*})
-  zstyle ':completion:*' hosts $_myhosts
+  _myhosts=$(while read host rest; do
+    host="${(f)host%%,*}"
+    case "$host" in
+      ([[:alnum:]]*) echo "$host";;
+      (\[[[:alnum:]]*) echo "${${host#\[}%\]*}";;
+    esac
+  done < ~/.ssh/known_hosts)
+  #_myhosts=(${${${${(f)"$(<$HOME/.ssh/known_hosts)"}:#[0-9]*}%%\ *}%%,*})
+  #zstyle ':completion:*' hosts $_myhosts

   unset _myhosts
 fi
 
   unset _myhosts
 fi
 


@@ -45,7 +52,7 @@ kssh() {
 }
 compdef -e "compset -P ${_SSH_SOCKDIR}/ || PREFIX=${_SSH_SOCKDIR}/; _files -W ${_SSH_SOCKDIR}" kssh
 
 }
 compdef -e "compset -P ${_SSH_SOCKDIR}/ || PREFIX=${_SSH_SOCKDIR}/; _files -W ${_SSH_SOCKDIR}" kssh
 

-sshcd() {
+scd() {

   local args host dir arg
 
   for arg in "$@"; do
   local args host dir arg
 
   for arg in "$@"; do


@@ -60,8 +67,9 @@ sshcd() {
 
   else
 
 
   else
 

-    ssh -t $args $host "cd '$dir' && exec \$SHELL --login"
+    ssh -t $args $host "cd '${dir:gs/\'/\'\\\'\'}' && exec \$SHELL --login"

   fi
 }
   fi
 }

+compdef scd=scp

 
 # vim:ft=zsh
 
 # vim:ft=zsh