Commit a4c49d29 authored by Dom Sekotill's avatar Dom Sekotill
Browse files

Fix SSH config issues for old versions

parent ba92f064

.shell/lib/ssh.sh

+1 −2
Original line number Diff line number Diff line
@@ -21,8 +21,6 @@ ssh_version() { 
}



make_config() {

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



	ssh_version || return 1



	# SSH >=7.2 does not need a filtered config
@@ -30,6 +28,7 @@ make_config() { 
	[ $SSH_MAJOR -eq 7 ] && [ $SSH_MINOR -ge 2 ] && return



	SSH_CONFIG=$HOME/.ssh/configs/$PLATFORM.$KERNEL.$SSH_MAJOR.$SSH_MINOR.config

	export SSH_CONFIG



	if [ -f "$SSH_CONFIG" ] &&

		[ "$SSH_CONFIG" -nt ~/.ssh/config ] &&

.ssh/config

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ Host gateway gateway.net.kodo.org.uk lw.kodo.org.uk 
	CheckHostIP no



Host !1-gw1.net.kodo.org.uk *.net.kodo.org.uk 10.56.*

	ProxyCommand ~/.ssh/forward %h %p ssh-port-user@1-gw1.net.kodo.org.uk

	ProxyCommand ~/.ssh/forward %r@%h %p ssh-port-user@1-gw1.net.kodo.org.uk

	CheckHostIP no

.ssh/forward

+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ SSH_DIR=`dirname $0` 
HOST=$1

PORT=$2



set ssh -W $1:$2 $3

set ssh ${SSH_CONFIG:+-F "$SSH_CONFIG"} -W $1:$2 $3



for PYTHON in python3.7 python3.6 python3.5 python3.4 python3.3 python3 \

	python2.7 python2 python