diff --git a/home/.bash_env b/home/.bash_env index 63c1dd5..f1f9c6b 100644 --- a/home/.bash_env +++ b/home/.bash_env @@ -1,46 +1,35 @@ export GOPATH=~/build/go -source $HOME/.cargo/env +source ${HOME}/.cargo/env if [ -d ~/bin ]; then - export PATH=$PATH:~/bin/scripts:~/bin + export PATH=${PATH}:~/bin/scripts:~/bin fi -if [ -d $GOPATH/bin ]; then - export PATH=$GOPATH/bin:$PATH +if [ -d ~/.npm-global/bin ]; then + export PATH=${PATH}:~/.npm-global/bin/ +fi + +if [ -d ${GOPATH}/bin ]; then + export PATH=${GOPATH}/bin:${PATH} fi # OS X stuff if availabe -if [[ "$OSTYPE" == "darwin"* ]]; then - if [ -d /opt/local/bin ]; then - export PATH=/opt/local/bin:/opt/local/sbin:$PATH - fi - - if [ -d /opt/local/libexec/gnubin ]; then - export PATH=/opt/local/libexec/gnubin:$PATH - fi - +if [[ "${OSTYPE}" == "darwin"* ]]; then # MacGPG2 if [ -d /usr/local/MacGPG2/bin/ ]; then - export PATH=/usr/local/MacGPG2/bin/:$PATH + export PATH=/usr/local/MacGPG2/bin/:${PATH} fi # Macports man-pages if [ -d /opt/local/share/man ]; then - export MANPATH=/opt/local/share/man:$MANPATH + export MANPATH=/opt/local/share/man:${MANPATH} fi # Linux man-pages if [ -d /opt/man-pages ]; then - export MANPATH=/opt/man-pages:$MANPATH + export MANPATH=/opt/man-pages:${MANPATH} fi - - # Python - for VER in 3.7 2.7; do - if [ -d /opt/local/Library/Frameworks/Python.framework/Versions/$VER/bin ]; then - export PATH=/opt/local/Library/Frameworks/Python.framework/Versions/$VER/bin:$PATH - fi - done fi if [ -r ~/.gpg-agent-info ]; then