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 335f5f345b2b5b66b19be66dc36d54daf0eb6991..166fa12efe15da830939ac398fcbf408bb43ecb0 100644 (file)
--- a/.zsh/zshrc/parts.d/50-ssh
+++ b/.zsh/zshrc/parts.d/50-ssh
@@ -20,19 +20,48 @@ _ssh_proxy() {
   local cmd sshopts cmdopts
   cmd="$1"; shift
   sshopts="${*%%--*}"; sshopts="${sshopts%% }"
+  [[ -n "$sshopts" ]] || { ssh; return $? }
   cmdopts="${*#$sshopts}"; cmdopts="${cmdopts#*-- }"
-  ssh $sshopts -t $cmd $cmdopts
+  eval ssh $sshopts -t $cmd $cmdopts
 }
 
-alias rrsh='_ssh_proxy "su -"'
+# need functions instead of aliases for completion
+rrsh() { _ssh_proxy "sudo -i" "$@" }
 compdef rrsh=ssh
 
-alias ttsh='_ssh_proxy "tmux last"'
+ttsh() { _ssh_proxy "tmux last" "$@" }
 compdef ttsh=ssh
 
-alias rtsh='_ssh_proxy "tmux new su -"'
+rtsh() { _ssh_proxy "tmux new sudo -i" "$@" }
 compdef rtsh=ssh
 
-alias kssh='rm -vf -- $VARDIR/ssh/ssh_control_*(=as-60Y1omN)'
+declare _SSH_SOCKDIR="${VARDIR}/ssh"
+kssh() {
+  if [[ -z "$1" ]]; then
+    rm -vf -- ${_SSH_SOCKDIR}/*(=as-60Y1omN)
+  else
+    rm "$@"
+  fi
+}
+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