display error if sshproxy functions get no arguments

[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 98f730d5d027cb5f06562eb4532fa36dc70ce5ac..0e6e62c801e5702640dd1031131c25c8ecbe36a7 100644 (file)
--- a/.zsh/zshrc/parts.d/50-ssh
+++ b/.zsh/zshrc/parts.d/50-ssh
@@ -16,9 +16,35 @@ if [ -r $HOME/.ssh/known_hosts ]; then
   unset _myhosts
 fi
 
-rrsh() { ssh "${@:-}" -t /bin/su - }
+_ssh_proxy() {
+  local cmd sshopts cmdopts
+  cmd="$1"; shift
+  sshopts="${*%%--*}"; sshopts="${sshopts%% }"
+  [[ -n "$sshopts" ]] || { ssh; return $? }
+  cmdopts="${*#$sshopts}"; cmdopts="${cmdopts#*-- }"
+  eval ssh $sshopts -t $cmd $cmdopts
+}
+
+# need functions instead of aliases for completion
+rrsh() { _ssh_proxy "su -" "$@" }
 compdef rrsh=ssh
 
-alias kssh='rm -vf -- $VARDIR/ssh/ssh_control_*(=as-60Y1omN)'
+ttsh() { _ssh_proxy "tmux last" "$@" }
+compdef ttsh=ssh
+
+rtsh() { _ssh_proxy "tmux new su -" "$@" }
+compdef rtsh=ssh
+
+local SOCKDIR=$VARDIR/ssh
+kssh() {
+  local SOCKDIR=$SOCKDIR
+  if [[ -z "$1" ]]; then
+    rm -vf -- $SOCKDIR/ssh_control_*(=as-60Y1omN)
+  else
+    rm "$@"
+  fi
+}
+compdef "_files -W $SOCKDIR" kssh
+unset SOCKDIR
 
 # vim:ft=zsh