tadgy/dotfiles
1
0
Fork 0
Code Releases Wiki Activity Actions

Fixing conflicts

Browse source
This commit is contained in:
Darren 'Tadgy' Austin 2017-10-19 13:51:14 +01:00
commit c3c6c7850a
3 changed files with 12 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

12
.bash_profile
View file

@ -13,11 +13,6 @@ export PATH="/usr/local/sbin:/usr/sbin:/opt/sbin:/sbin:$PATH"
export VISUAL="$EDITOR"
[ -x /usr/bin/lesspipe ] && eval "$(SHELL=/bin/sh lesspipe)"
# Add bin directories to PATH.
[ -d ~/.local/bin ] && export PATH="~/.local/bin:$PATH"
[ -d ~/bin ] && export PATH="~/bin:$PATH"
[ -d ~/files/bin ] && export PATH="~/files/bin:$PATH"
# Platform specific set up.
_PLATFORM="$(uname -s)"
if [ "$_PLATFORM" = "Linux" ]; then
@ -27,12 +22,17 @@ if [ "$_PLATFORM" = "Linux" ]; then
elif [ "$_PLATFORM" = "Darwin" ]; then
export LSCOLORS="ExGxdxdxCxDxDxbcacbeae"
export MANPATH="/opt/local/share/man:$MANPATH"
export PATH="/opt/local/bin:/opt/local/sbin:$PATH"
export PATH="/opt/local/sbin:/opt/local/bin:$PATH"
else
echo "${BASH_SOURCE##*/}: unsupported platform: $_PLATFORM" >&2
fi
unset _PLATFORM
# Add bin directories to PATH.
[ -d ~/files/bin ] && export PATH="~/files/bin:$PATH"
[ -d ~/.local/bin ] && export PATH="~/.local/bin:$PATH"
[ -d ~/bin ] && export PATH="~/bin:$PATH"
# SSH agent.
hash ssh-add ssh-agent >/dev/null 2>&1 && {
if [ ! -z "$SSH_AUTH_SOCK" ]; then