fernando/dotfiles
1
0
Fork 0
Code Issues 4 Pull requests Projects Releases Packages Wiki Activity

Ensure PATH directories are in correct order

Browse source 
Previously we only checked if the new directory was already in the PATH
and, if yes, didn't prepend it. This can cause the new directory to be
in an unexpected position.

Now we first remove any occurrences of the new directory (to prevent
duplication) and prepend it so it's in the position we expect.
This commit is contained in:
Fernando Schauenburg 2019-11-11 13:04:25 +01:00
parent 10ad8282e2
commit 4e9c8e8470
1 changed files with 19 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
dotfiles/.config/bash/profile
View file

@ -20,42 +20,50 @@ export LESSHISTFILE="$XDG_CACHE_HOME/less/history"
export LESSHISTSIZE=1000 export LESSHISTSIZE=1000
export LOCAL_PREFIX="/usr/local" export LOCAL_PREFIX="/usr/local"
[ command -v brew &>/dev/null ] && LOCAL_PREFIX=$(brew --prefix) [ command -v brew &>/dev/null ] && LOCAL_PREFIX=$(brew --prefix)
export MANPATH="$(MANPATH='' manpath)"
export PAGER=less export PAGER=less
export PYTHONSTARTUP="$XDG_CONFIG_HOME/python/startup.py" export PYTHONSTARTUP="$XDG_CONFIG_HOME/python/startup.py"
export VIMINIT='let $MYVIMRC="$XDG_CONFIG_HOME/vim/vimrc" | source $MYVIMRC' export VIMINIT='let $MYVIMRC="$XDG_CONFIG_HOME/vim/vimrc" | source $MYVIMRC'
##############################################################################
# Customize PATH (and MANPATH)
##############################################################################
# Prevent path_helper from messing with the PATH when starting tmux. # Prevent path_helper from messing with the PATH when starting tmux.
# See: https://superuser.com/a/583502 # See: https://superuser.com/a/583502
[ "$(uname)" == "Darwin" ] && { PATH=""; source /etc/profile; } [ "$(uname)" == "Darwin" ] && { PATH=""; source /etc/profile; }
prepend_dir() { # 1: dir to add, 2: variable to manipulate
[ -d "$1" -a -n "$2" ] || return
local list="${!2}" # capture current value
list=${list#"$1sep"} # remove dir from beginning
list=${list//":$1:"/:} # remove dir from middle
list=${list%":$1"} # remove dir from end
printf -v "$2" "$1${list:+":$list"}" # add in front (use : only if empty)
}
# Add custom bin dirs to PATH if they exist and are not already in PATH. # Add custom bin dirs to PATH if they exist and are not already in PATH.
while read -r dir; do while read -r dir; do prepend_dir "$dir" PATH; done <<EOL
[ -d "$dir" ] && [[ ":$PATH:" != *":$dir:"* ]] && PATH="$dir:$PATH"
done <<EOS
$LOCAL_PREFIX/bin $LOCAL_PREFIX/bin
$LOCAL_PREFIX/opt/man-db/libexec/bin $LOCAL_PREFIX/opt/man-db/libexec/bin
$LOCAL_PREFIX/opt/coreutils/libexec/gnubin $LOCAL_PREFIX/opt/coreutils/libexec/gnubin
$LOCAL_PREFIX/opt/gnu-sed/libexec/gnubin $LOCAL_PREFIX/opt/gnu-sed/libexec/gnubin
$HOME/.local/bin $HOME/.local/bin
$HOME/bin $HOME/bin
EOS EOL
# Prepend custom man directories to MANPATH if they exist, so that we get # Prepend custom man directories to MANPATH if they exist, so that we get
# correct man page entries when multiple versions of a command are # correct man page entries when multiple versions of a command are
# available. # available.
export MANPATH while read -r dir; do prepend_dir "$dir" MANPATH; done <<EOL
MANPATH=$(MANPATH='' manpath)
while read -r dir; do
[ -d "$dir" ] && [[ ":$MANPATH:" != *":$dir:"* ]] && MANPATH="$dir:$MANPATH"
done <<EOS
$LOCAL_PREFIX/share/man $LOCAL_PREFIX/share/man
$LOCAL_PREFIX/opt/man-db/libexec/man $LOCAL_PREFIX/opt/man-db/libexec/man
$LOCAL_PREFIX/opt/coreutils/libexec/gnuman $LOCAL_PREFIX/opt/coreutils/libexec/gnuman
$LOCAL_PREFIX/opt/gnu-sed/libexec/gnuman $LOCAL_PREFIX/opt/gnu-sed/libexec/gnuman
$HOME/.local/share/man $HOME/.local/share/man
EOS EOL
unset dir unset dir prepend_dir
############################################################################## ##############################################################################
# Customize shell options & variables # Customize shell options & variables