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

diff --git a/.zsh/zshrc/parts.d/50-ssh b/.zsh/zshrc/parts.d/50-ssh
index eb57f74..1d840eb 100644
--- a/.zsh/zshrc/parts.d/50-ssh
+++ b/.zsh/zshrc/parts.d/50-ssh
@@ -16,11 +16,35 @@ if [ -r $HOME/.ssh/known_hosts ]; then
   unset _myhosts
 fi
 
-local _NEW_KNOWN_HOSTS=~/.ssh/known_hosts.NEW
-alias ssh="{ [[ -f $_NEW_KNOWN_HOSTS ]] && warn $_NEW_KNOWN_HOSTS exists }; command ssh"
-alias sshnew="ssh -o 'StrictHostKeyChecking no' -o 'UserKnownHostsFile $_NEW_KNOWN_HOSTS'"
-alias scpnew="scp -o 'StrictHostKeyChecking no' -o 'UserKnownHostsFile $_NEW_KNOWN_HOSTS'"
-alias sshtmp="ssh -o 'StrictHostKeyChecking no' -o 'UserKnownHostsFile /dev/null'"
-alias scptmp="scp -o 'StrictHostKeyChecking no' -o 'UserKnownHostsFile /dev/null'"
+_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 "sudo -i" "$@" }
+compdef rrsh=ssh
+
+ttsh() { _ssh_proxy "tmux last" "$@" }
+compdef ttsh=ssh
+
+rtsh() { _ssh_proxy "tmux new sudo -i" "$@" }
+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