dotfiles.git

@@ -15,5 +15,7 @@ if [[ $(uname -s) == Darwin* ]]; then

         alias ctags="$(brew --prefix)/bin/ctags"

     fi

     # Set default names for GNU grep, sed and find

-    PATH="/usr/local/opt/grep/libexec/gnubin:/usr/local/opt/gnu-sed/libexec/gnubin:/usr/local/opt/findutils/libexec/gnubin:$PATH"

+    prepend_to_path /usr/local/opt/grep/libexec/gnubin

+    prepend_to_path /usr/local/opt/gnu-sed/libexec/gnubin

+    prepend_to_path /usr/local/opt/findutils/libexec/gnubin

 fi

@@ -58,12 +58,18 @@ export PS1='$(if [ $? -eq 0 ]; then echo -e "\[\e[32m\]\xe2\x9c\x93";

 set -o vi

-add_to_path() {

+append_to_path() {

     if [ -d "$1" ] && [[ ! $PATH =~ (^|:)$1(:|$) ]]; then

         PATH+=:$1

     fi

 }

+prepend_to_path() {

+    if [ -d "$1" ] && [[ ! $PATH =~ (^|:)$1(:|$) ]]; then

+        PATH=$1:$PATH

+    fi

+}

+

 # if this is a CygWin .bashrc, then set CygWin's commands first in PATH

 # because link.exe and find.exe exist in Windows's path.

 # Add /usr/lib/lapack at the end so python's numpy can find lapack_lite

@@ -71,7 +77,7 @@ add_to_path() {

 if [[ $(uname -s) == CYGWIN* ]]; then

     PATH=/usr/local/bin:/usr/bin:$PATH

     PATH=${PATH//":/usr/local/bin:/usr/bin"/} # delete any instances in middle

-    add_to_path /usr/lib/lapack

+    append_to_path /usr/lib/lapack

     export GIT_SSH=/cygdrive/c/cygwin64/bin/ssh

     ulimit -n 1024 # for "duplicity"

 elif [[ -n "${WSL_DISTRO_NAME}" ]]; then

@@ -107,7 +113,7 @@ alias tmux='tmux -2u'

 export GCC_COLORS='error=01;31:warning=01;35:note=01;36:caret=01;32:locus=01:quote=01'

 # Add to PATH only if not already in PATH.

-add_to_path $HOME/bin

+append_to_path $HOME/bin

 # For interactive shells ('i' in $-), disable stty flow control (ctrl+s,ctrl+q)

 case "$-" in