add-path reviewed

Author: gsell

tcl/envmngt.tcl.in

@@ -1816,18 +1816,19 @@ proc add-path {cmd mode dflbhv args} {
    set val [get-env $var]
 
    foreach dir $path_list {
-      # if path_entry_reorder is TRUE && dir is in path
-      #    && duplicates are NOT allowed:
-      #    path: remove all occurences of $dir
-      # if path_entry_reorder is TRUE || dir is NOT in path
-      #   || duplicates are allowed:
-      #    path: append/prepend $dir
+      # remove $dir from path only if path_entry_reorder is true and
+      # $dir is already in path and duplicates are NOT allowed.
       if {[getConf path_entry_reorder] && [info exists countarr($dir)]\
          && ! $allow_dup} {
          set mpath_list [split $val $separator]
          set mpath_list [lsearch -inline -all -not -exact $mpath_list $dir]
          set val [join $mpath_list $separator]
       }
+      # add $dir to beginning or end only if path_entry_reorder is true or
+      # $dir is NOT in path or duplicates are allowed.
+      # Please note: if path_entry_reorder is true and duplicates are not
+      # allowed, $dir is not in path ($val) - either it was not in or it
+      # had been removed. Hence we have to add it.
       if {[getConf path_entry_reorder] || ![info exists countarr($dir)]\
          || $allow_dup} {
          # ignore env var set empty if no empty entry found in reference
@@ -1844,17 +1845,14 @@ proc add-path {cmd mode dflbhv args} {
       #### ref-counting
       # if $dir is NOT in path
       #    set ref-count 1
-      # else if duplicates are allowed || ref-counting is NOT ignored
-      #    incr ref-count
-       if {[info exists countarr($dir)]} {
-         # do not increase counter if bare separator string is added or if
-         # reference count is ignored (--ignore-refcount set) unless if
-         # duplicate mode is enabled (--duplicates set)
-         if {!$val_set_is_delim && (!$ign_refcount || $allow_dup)} {
-            incr countarr($dir)
-         }
-      } else {
+      # else
+      #    do NOT increase counter if bare separator string is added or if
+      #    reference count is ignored (--ignore-refcount set) unless if
+      #    duplicate mode is enabled (--duplicates set)
+      if {![info exists countarr($dir)]} {
          set countarr($dir) 1
+      } elseif {!$val_set_is_delim && (!$ign_refcount || $allow_dup)} {
+         incr countarr($dir)
       }
    }