Cleanup path manipulation

1 files changed, 33 insertions, 11 deletions

diff --git a/.bashrc b/.bashrc
index 869e6e4..725b7d4 100644
--- a/.bashrc
+++ b/.bashrc
@@ -30,7 +30,7 @@ function load_all_from
 #
 # usage: add_to_path_var <var_name> <path_value> [suffix]
 #
-# This function will (by default) prefix a path-like variable with another
+# This function will (by default) suffix a path-like variable with another
 # path, provided the path does not already exist in the variable. If it does no
 # action is taken. Passing a third argument of 1 will result in the path being
 # appended to the variable.
@@ -39,19 +39,19 @@ function add_to_path_var()
 {
     local var_name="$1"
     local add_value="$2"
-    local suffix=${3:-0}
+    local prefix=${3:-0}
 
         case :${!var_name}: in
-                *:$add_value:*)
+                *:${add_value}:*)
                         ;;
                 *)
                         if [ -z "${!var_name}" ]; then
                                 eval "$var_name=$add_value"
                         else
-                if [ "$suffix" == "1" ]; then
-                    eval "$var_name=${!var_name}:$add_value"
-                else
+                if [ $prefix -eq 1 ]; then
                     eval "$var_name=$add_value:${!var_name}"
+                else
+                    eval "$var_name=${!var_name}:$add_value"
                 fi
                         fi
                         ;;
@@ -214,9 +214,25 @@ alias testify="watchr ~/.watchr.rb"
 #
 # SETUP SYSTEM PATHS
 #
-PATH="/usr/local/bin:/usr/local/sbin:$HOME/bin:$PATH"
+# Start clean with stuff we want to override the system path
+_OPATH="$PATH"
+PATH="/usr/local/bin:/usr/local/sbin"
+
+# Push on all the system default stuff
+_IFS="$IFS"; IFS=:
+for pc in $_OPATH; do
+    case "$pc" in
+        # Why do distros seem to like to put this crap on the path?
+        /usr/games|/usr/local/games) ;;
+        # Skip past these, we'll add them later if relevant and want to prefix
+        # them to the path not have them de-duplicated in-place
+        "$HOME"/*) ;;
+        *) add_to_path_var PATH "$pc" ;;
+    esac
+done
+IFS="$_IFS"; unset _IFS
 
-# Local path setup
+# Locally compiled stuff
 LOCAL_PATH="$HOME/.local"
 if [[ -e "$LOCAL_PATH" ]]; then
     _include="-I${LOCAL_PATH}/include"
@@ -231,8 +247,13 @@ if [[ -e "$LOCAL_PATH" ]]; then
     fi
     unset _ldflags
 
-    add_to_path_var PATH "${LOCAL_PATH}/bin"
-    add_to_path_var PATH "${LOCAL_PATH}/sbin"
+    add_to_path_var PATH "${LOCAL_PATH}/bin" 1
+    add_to_path_var PATH "${LOCAL_PATH}/sbin" 1
+fi
+
+# This should take precedence over the $HOME/.local stuff
+if [[ -e "$HOME/bin" ]]; then
+    add_to_path_var PATH "$HOME/bin" 1
 fi
 
 if [[ -d /Applications/Postgres.app ]]; then
@@ -244,10 +265,11 @@ if [[ -d /Applications/Postgres.app ]]; then
 fi
 
 if [[ -d /usr/local/go ]]; then
-    add_to_path_var PATH "/usr/local/go/bin" 1
+    add_to_path_var PATH "/usr/local/go/bin"
 fi
 
 export PATH CFLAGS LDFLAGS
+unset _OPATH
 
 #
 # COMMAND ALIASES