escape dir in sshcd

[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 1d840ebdf475d408d50efe3acbd0987098c4ecd8..166fa12efe15da830939ac398fcbf408bb43ecb0 100644 (file)
--- a/.zsh/zshrc/parts.d/50-ssh
+++ b/.zsh/zshrc/parts.d/50-ssh
@@ -35,16 +35,33 @@ compdef ttsh=ssh
 rtsh() { _ssh_proxy "tmux new sudo -i" "$@" }
 compdef rtsh=ssh
 
-local SOCKDIR=$VARDIR/ssh
+declare _SSH_SOCKDIR="${VARDIR}/ssh"
 kssh() {
-  local SOCKDIR=$SOCKDIR
   if [[ -z "$1" ]]; then
-    rm -vf -- $SOCKDIR/ssh_control_*(=as-60Y1omN)
+    rm -vf -- ${_SSH_SOCKDIR}/*(=as-60Y1omN)
   else
     rm "$@"
   fi
 }
-compdef "_files -W $SOCKDIR" kssh
-unset SOCKDIR
+compdef -e "compset -P ${_SSH_SOCKDIR}/ || PREFIX=${_SSH_SOCKDIR}/; _files -W ${_SSH_SOCKDIR}" kssh
+
+sshcd() {
+  local args host dir arg
+
+  for arg in "$@"; do
+    case "$arg" in
+      (*:*) host=${arg%%:*}; dir="${arg#*:}";;
+      (*) args="${args:+$args }$arg";;
+    esac
+  done
+
+  if [[ -z $dir ]]; then
+    ssh "$@"
+
+  else
+
+    ssh -t $args $host "cd '${dir:gs/\'/\'\\\'\'}' && exec \$SHELL --login"
+  fi
+}
 
 # vim:ft=zsh