Commit 2ec4fa29 authored by Dom Sekotill's avatar Dom Sekotill
Browse files

Make ssh-preloader work with sub connections & git

parent 4d05d76f

.profile

+1 −0
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ export HISTIGNORE="&:ls:[bf]g:d[fu]:exit" 
export WORKON_HOME=~/.virtualenvs

export FIGNORE='.o:.pyc:~:.swp:.swa'

export VIRTUAL_ENV_DISABLE_PROMPT=yes

export GIT_SSH=$HOME/.ssh/ssh



has vim &&

	export EDITOR=vim ||

.ssh/ssh

+10 −3
Original line number Diff line number Diff line 
#!/bin/sh

set -eu



: ${SSH_BIN:=`which ssh`}; export SSH_BIN





ssh_version() {

	eval `ssh -V 2>&1 | sed -n \

		's/OpenSSH_\([0-9]\+\)\.\([0-9]\+\).*/SSH_MAJOR="\1" SSH_MINOR="\2"/p'`
@@ -33,9 +36,11 @@ rule_canonisation() { 
}



make_config() {

	[ -z "${CONFIG-}" ] || return 0



	platform && ssh_version



	CONFIG=`mktemp -p ~/.ssh/ .config.XXXXXX`

	CONFIG=`mktemp -p ~/.ssh/ .config.XXXXXX`; export CONFIG

	trap 'rm "$CONFIG"' EXIT



	cat ~/.ssh/config ~/.ssh/config.local 2>/dev/null |
@@ -45,10 +50,12 @@ make_config() { 
		"

}





case " $*" in

	*' -F'*) command ssh "$@" ;;

	*' -F'*) ${SSH_BIN} "$@" ;;

	*)

		make_config

		command ssh -F $CONFIG "$@"

		PATH="`dirname $0`:$PATH"; export PATH

		${SSH_BIN} -F "$CONFIG" "$@"

		;;

esac