X-Git-Url: https://git.madduck.net/etc/ssh.git/blobdiff_plain/5dae703a994751dddb49d7d7396999cb2fed9088..4d6632c9b8585576014e89b84c04628ef4bffd4b:/.zsh/zshrc/parts.d/50-ssh

diff --git a/.zsh/zshrc/parts.d/50-ssh b/.zsh/zshrc/parts.d/50-ssh
index 335f5f3..1d840eb 100644
--- a/.zsh/zshrc/parts.d/50-ssh
+++ b/.zsh/zshrc/parts.d/50-ssh
@@ -20,19 +20,31 @@ _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)'
+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