X-Git-Url: https://git.madduck.net/etc/ssh.git/blobdiff_plain/0f7868c7f27ad90eb5e734394e05541c9def3979..361eacfe215343d432812e29bd6369783679b210:/.zsh/zshrc/parts.d/50-ssh?ds=sidebyside

diff --git a/.zsh/zshrc/parts.d/50-ssh b/.zsh/zshrc/parts.d/50-ssh
index eb57f74..166fa12 100644
--- a/.zsh/zshrc/parts.d/50-ssh
+++ b/.zsh/zshrc/parts.d/50-ssh
@@ -16,11 +16,52 @@ 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
+
+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