add dynamic port forward to nz host @catalyst

[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 eb57f74606108a07e7cfe6cda1370a2025e81933..04b9358da5980bb477f90fb2684b0ea07c07ac43 100644 (file)
--- a/.zsh/zshrc/parts.d/50-ssh
+++ b/.zsh/zshrc/parts.d/50-ssh
@@ -11,16 +11,65 @@
 # populate hosts completion with SSH's known_hosts
 if [ -r $HOME/.ssh/known_hosts ]; then
   local _myhosts
-  _myhosts=(${${${${(f)"$(cat $HOME/.ssh/known_hosts)"}:#[0-9]*}%%\ *}%%,*})
-  zstyle ':completion:*' hosts $_myhosts
+  _myhosts=$(while read host rest; do
+    host="${(f)host%%,*}"
+    case "$host" in
+      ([[:alnum:]]*) echo "$host";;
+      (\[[[:alnum:]]*) echo "${${host#\[}%\]*}";;
+    esac
+  done < ~/.ssh/known_hosts)
+  #_myhosts=(${${${${(f)"$(<$HOME/.ssh/known_hosts)"}:#[0-9]*}%%\ *}%%,*})
+  #zstyle ':completion:*' hosts $_myhosts
   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
+
+scd() {
+  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
+}
+compdef scd=scp
 
 # vim:ft=zsh