Commit 8772f1da authored Aug 22, 2017 by Dom Sekotill

Reorganise local shell settings

parent 48ca94d8

.bash_profile

+1 −3

Original line number	Diff line number	Diff line
		@@ -8,7 +8,7 @@ export BASH_PROFILE_LOADED=1
		PROMPT_COMMAND=:

		# Source all-shell startup profile environments
		source_first ~/.profile /etc/profile
		source_each ~/.profile ~/.profile_local

		# Prompt
		if [ -n "$PS1" ]; then
		@@ -17,8 +17,6 @@ if [ -n "$PS1" ]; then
		export PS1
		fi

		source_each ~/.bash_local

		# Automatically run terminal multiplexer on SSH connect
		[ -n "$SSH_TTY" ] && [ "x$TERM" != xscreen ] && has tmux &&
		exec ~/.shell/bin/tmux-display-helper start-client

.bashrc

+3 −0

Original line number	Diff line number	Diff line
		@@ -18,6 +18,9 @@ do_update
		source_first /etc/bash.bashrc /etc/bashrc
		PS1="${_PS1-$PS1}"

		# Local shell settings
		source_each ~/.bash_local

		source_each ~/.shell/aliases ~/.shell/$(get_platform)/aliases ~/.bash_aliases

		# Bash completion

.zprofile

+1 −2

Original line number	Diff line number	Diff line
		source ~/.shell/funcs

		# Source all-shell startup profile environments
		source_first ~/.profile /etc/profile
		source_each ~/.zsh_local
		source_each ~/.profile ~/.profile_local

		# Automatically run terminal multiplexer on SSH connect
		[ -n "$SSH_TTY" ] && [ "x$TERM" != xscreen ] && has tmux &&

.zshrc

+3 −0

Original line number	Diff line number	Diff line
		@@ -17,6 +17,9 @@ if [[ ! -d $ZSH ]] && has git; then
		fi
		[[ -d $ZSH ]] && source $ZSH/oh-my-zsh.sh

		# Local shell settings
		source_each ~/.zsh_local

		source_each ~/.shell/aliases ~/.shell/$(get_platform)/aliases ~/.aliases

		unsetopt share_history