From 2743990939986a1bf717982c88181369ff561302 Mon Sep 17 00:00:00 2001
From: Egor Tensin <Egor.Tensin@gmail.com>
Date: Mon, 22 May 2023 08:28:39 +0000
Subject: path.sh: append by default in path_add

---
 %HOME%/.bash_utils/path.sh | 30 +++++++++++++++++++++---------
 1 file changed, 21 insertions(+), 9 deletions(-)

(limited to '%HOME%')

diff --git a/%HOME%/.bash_utils/path.sh b/%HOME%/.bash_utils/path.sh
index 20c6a31..0661710 100644
--- a/%HOME%/.bash_utils/path.sh
+++ b/%HOME%/.bash_utils/path.sh
@@ -14,6 +14,13 @@ path_add() (
     shopt -s inherit_errexit 2> /dev/null || true
     shopt -s lastpipe
 
+    local prepend=
+
+    if [ "$#" -gt 0 ] && [ "$1" == --prepend ]; then
+        shift
+        prepend=y
+    fi
+
     [ "$#" -eq 0 ] && return 0
 
     local -a src_list
@@ -30,24 +37,29 @@ path_add() (
         fi
     done
 
-    local -A dest_dict
-    local -a dest_list
+    local -A uniq_paths
+    local -a new_paths current_paths
 
     for path in ${src_list[@]+"${src_list[@]}"}; do
-        [ -n "${dest_dict[$path]+x}" ] && continue
-        dest_dict[$path]=1
-        dest_list+=("$path")
+        [ -n "${uniq_paths[$path]+x}" ] && continue
+        uniq_paths[$path]=1
+        new_paths+=("$path")
     done
 
     if [ -n "${PATH-}" ]; then
         str_split -z -- "${PATH-}" ':' | xargs -0 -- readlink -z --canonicalize-missing -- | while IFS= read -d '' -r path; do
-            [ -n "${dest_dict[$path]+x}" ] && continue
-            dest_dict[$path]=1
-            dest_list+=("$path")
+            [ -n "${uniq_paths[$path]+x}" ] && continue
+            uniq_paths[$path]=1
+            current_paths+=("$path")
         done
     fi
 
-    str_join ':' ${dest_list[@]+"${dest_list[@]}"}
+    local -a result
+    [ -n "$prepend" ] && result+=(${new_paths[@]+"${new_paths[@]}"})
+    result+=(${current_paths[@]+"${current_paths[@]}"})
+    [ -z "$prepend" ] && result+=(${new_paths[@]+"${new_paths[@]}"})
+
+    str_join ':' ${result[@]+"${result[@]}"}
 )
 
 path_export() {
-- 
cgit v1.2.3