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

Only set-up SSH behaviours if using SSH<7.2

parent ce4bf3a3

.profile

+1 −5
Original line number Diff line number Diff line
@@ -6,7 +6,6 @@ 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.sh

export EDITOR="$HOME/.vim/bin/vim.remote"

export GOROOT=$HOME/.local/go

export GOPATH=$HOME/.local/gopath
@@ -20,7 +19,7 @@ export PYTHONUSERBASE=$HOME/.local 
# "~/.local"

PREFIX=":/usr:/usr/local"



source_each ~/.shell/$(get_platform)/profile ~/.profile_local

source_each ~/.shell/$(get_platform)/profile ~/.profile_local ~/.shell/ssh



# Scripts brought in by dotfiles repo

manage_path PATH ~/.shell/upstream/git-scripts/bin
@@ -39,9 +38,6 @@ manage_path PATH /bin before check 
manage_path PATH /usr/bin before check

manage_path PATH /usr/local/bin before check



# SSH scripts

manage_path PATH ~/.ssh/bin before



# User-local paths

manage_path PATH ~/.local/bin before check

manage_path PATH ~/.local/go/bin before

.shell/aliases

+0 −6
Original line number Diff line number Diff line
@@ -19,12 +19,6 @@ alias grep='~/.shell/bin/grep-auto-exclude grep -n' 
alias fgrep='~/.shell/bin/grep-auto-exclude fgrep -n'

alias egrep='~/.shell/bin/grep-auto-exclude egrep -n'



# special SSH

. ~/.shell/lib/ssh.sh

make_config

alias ssh="ssh -F '${SSH_CONFIG}'"

alias scp="scp -F '${SSH_CONFIG}'"



# special vim

alias vim="FROM_ALIAS=yes $EDITOR"

.shell/lib/ssh.sh

+4 −0
Original line number Diff line number Diff line
@@ -25,6 +25,10 @@ make_config() { 


	ssh_version || return 1



	# SSH >=7.2 does not need a filtered config

	[ $SSH_MAJOR -gt 7 ] && return

	[ $SSH_MAJOR -eq 7 ] && [ $SSH_MINOR -ge 2 ] && return



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



	if [ -f "$SSH_CONFIG" ] &&

.shell/ssh

0 → 100644
+11 −0
Original line number Diff line number Diff line 
. ~/.shell/lib/ssh.sh

make_config



test -n "$SSH_CONFIG" || return 0



alias ssh="ssh -F '${SSH_CONFIG}'"

alias scp="scp -F '${SSH_CONFIG}'"



export GIT_SSH=$HOME/.ssh/ssh.sh



manage_path PATH ~/.ssh/bin before