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

Keep installation prefix in the environment

Browse source
This commit is contained in:
Fernando Schauenburg 2019-11-11 11:20:24 +01:00
parent a49fe75566
commit d5245eab46
1 changed files with 13 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
dotfiles/.config/bash/profile
View file

@ -18,16 +18,12 @@ export LC_CTYPE="en_US.UTF-8"
export LESS="-i -j.49 -M -R -z-2" export LESS="-i -j.49 -M -R -z-2"
export LESSHISTFILE="$XDG_CACHE_HOME/less/history" export LESSHISTFILE="$XDG_CACHE_HOME/less/history"
export LESSHISTSIZE=1000 export LESSHISTSIZE=1000
export LOCAL_PREFIX="/usr/local"
[ command -v brew &>/dev/null ] && LOCAL_PREFIX=$(brew --prefix)
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'
# Find out where Homebrew performs installations. If Homebrew is not
# installed (e.g. running on Linux), assume /usr/local for our
# installations.
prefix=/usr/local
if command -v brew &>/dev/null; then prefix=$(brew --prefix); fi
# 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
if [ "$(uname)" == "Darwin" ]; then if [ "$(uname)" == "Darwin" ]; then
@ -43,10 +39,10 @@ while read -r bindir; do
PATH="$bindir:$PATH" PATH="$bindir:$PATH"
fi fi
done <<EOS done <<EOS
$prefix/bin $LOCAL_PREFIX/bin
$prefix/opt/man-db/libexec/bin $LOCAL_PREFIX/opt/man-db/libexec/bin
$prefix/opt/coreutils/libexec/gnubin $LOCAL_PREFIX/opt/coreutils/libexec/gnubin
$prefix/opt/gnu-sed/libexec/gnubin $LOCAL_PREFIX/opt/gnu-sed/libexec/gnubin
$HOME/.local/bin $HOME/.local/bin
$HOME/bin $HOME/bin
EOS EOS
@ -61,14 +57,14 @@ while read -r mandir; do
MANPATH="$mandir:$MANPATH" MANPATH="$mandir:$MANPATH"
fi fi
done <<EOS done <<EOS
$prefix/share/man $LOCAL_PREFIX/share/man
$prefix/opt/man-db/libexec/man $LOCAL_PREFIX/opt/man-db/libexec/man
$prefix/opt/coreutils/libexec/gnuman $LOCAL_PREFIX/opt/coreutils/libexec/gnuman
$prefix/opt/gnu-sed/libexec/gnuman $LOCAL_PREFIX/opt/gnu-sed/libexec/gnuman
$HOME/.local/share/man $HOME/.local/share/man
EOS EOS
unset prefix bindir mandir unset bindir mandir
############################################################################## ##############################################################################
# Customize shell options & variables # Customize shell options & variables
@ -366,8 +362,8 @@ stty -ixon # disable ctrl-s and ctrl-q
_update_colors "${BACKGROUND:-dark}" _update_colors "${BACKGROUND:-dark}"
# Enable available completion helpers # Enable available completion helpers
if [ -d /usr/local/etc/bash_completion.d ]; then if [ -d "$LOCAL_PREFIX/etc/bash_completion.d" ]; then
for completion in /usr/local/etc/bash_completion.d/*; do for completion in "$LOCAL_PREFIX/etc/bash_completion.d/*"; do
# shellcheck disable=SC1090 # shellcheck disable=SC1090
source "$completion" source "$completion"
done done