X-Git-Url: https://git.madduck.net/etc/ssh.git/blobdiff_plain/28e3d69d17ced85acbd61b97e6003f15030f9576..2138841924bdd5572b2b332b06e2b0f94fdb18e5:/.zsh/zshrc/parts.d/50-ssh

diff --git a/.zsh/zshrc/parts.d/50-ssh b/.zsh/zshrc/parts.d/50-ssh
index d872af2..04b9358 100644
--- 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
-  _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
 
@@ -45,7 +52,7 @@ 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
@@ -60,8 +67,9 @@ sshcd() {
 
   else
 
-    ssh -t $args $host "cd '$dir' && exec \$SHELL --login"
+    ssh -t $args $host "cd '${dir:gs/\'/\'\\\'\'}' && exec \$SHELL --login"
   fi
 }
+compdef scd=scp
 
 # vim:ft=zsh