config option renamed and add-path reviewed

Author: gsell

init/Makefile

@@ -136,7 +136,7 @@ comp_lint_opts := -a -i --all --icase
 comp_modtosh_opts := --auto --no-auto --force -f --icase -i
 comp_path_opts := -d --delim --duplicates
 comp_rm_path_opts := -d --delim --index
-comp_config_opts := --dump-state --reset abort_on_error advanced_version_spec auto_handling avail_indepth avail_output avail_terse_output cache_buffer_bytes cache_expiry_secs collection_pin_version collection_pin_tag collection_target color colors conflict_unload contact editor extended_default extra_siteconfig hide_auto_loaded home icase ignore_cache ignore_user_rc implicit_default implicit_requirement list_output list_terse_output locked_configs logged_events logger mcookie_check mcookie_version_check ml nearly_forbidden_days pager protected_envvars quarantine_support rcfile redirect_output require_via reset_target_state run_quarantine search_match set_shell_startup shells_with_ksh_fpath silent_shell_debug source_cache spider_indepth spider_output spider_terse_output sticky_purge tag_abbrev tag_color_name tcl_linter term_background term_width unique_name_loaded unload_match_order variant_shortcut verbosity wa_277 lmod_path_rule
+comp_config_opts := --dump-state --reset abort_on_error advanced_version_spec auto_handling avail_indepth avail_output avail_terse_output cache_buffer_bytes cache_expiry_secs collection_pin_version collection_pin_tag collection_target color colors conflict_unload contact editor extended_default extra_siteconfig hide_auto_loaded home icase ignore_cache ignore_user_rc implicit_default implicit_requirement list_output list_terse_output locked_configs logged_events logger mcookie_check mcookie_version_check ml nearly_forbidden_days pager protected_envvars quarantine_support rcfile redirect_output require_via reset_target_state run_quarantine search_match set_shell_startup shells_with_ksh_fpath silent_shell_debug source_cache spider_indepth spider_output spider_terse_output sticky_purge tag_abbrev tag_color_name tcl_linter term_background term_width unique_name_loaded unload_match_order variant_shortcut verbosity wa_277 path_entry_reorder
 
 define translate-in-script
 $(ECHO_GEN)
@@ -167,7 +167,7 @@ sed -e 's|@prefix@|$(prefix)|g' \
 	-e 's|@comp_path_opts@|$(comp_path_opts)|g' \
 	-e 's|@comp_rm_path_opts@|$(comp_rm_path_opts)|g' \
 	-e 's|@comp_config_opts@|$(comp_config_opts)|g' \
-	-e 's|@comp_lmod_path_rule@|$(comp_lmod_path_rule)|g' \
+	-e 's|@comp_path_entry_reorder@|$(comp_path_entry_reorder)|g' \
 	-e '$(setzshfpathre)' \
 	-e $$'s|@modulerc@|$(modulerc)|g' \
 	-e 's|@modulepath@|$(modulepath)|g' \

tcl/envmngt.tcl.in

@@ -1796,7 +1796,7 @@ proc add-path {cmd mode dflbhv args} {
       set bhv $dflbhv
    } else {
       lassign [parsePathCommandArgs $cmd $mode $dflbhv {*}$args] separator\
-         allow_dup idx_val ign_refcount val_set_is_delim glob_match bhv var\
+	 allow_dup idx_val ign_refcount val_set_is_delim glob_match bhv var\
          path_list
    }
 
@@ -1815,33 +1815,29 @@ proc add-path {cmd mode dflbhv args} {
 
    set val [get-env $var]
 
-   if {[getConf lmod_path_rule]} {
-      set mpath_list [split $val $separator]
-      foreach dir $path_list {
-         if {$bhv eq {prepend}} {
-            set mpath_list "$dir [lsearch -inline -all -not -exact\
-                $mpath_list $dir]"
-         } else {
-            set mpath_list "[lsearch -inline -all -not -exact\
-                $mpath_list $dir] $dir"
+   foreach dir $path_list {
+      set dir_removed 0
+      if {[getConf path_entry_reorder]} {
+         if {[info exists countarr($dir)] && ! $allow_dup} {
+            # remove dir if in $val and duplicates are not allowed
+            set mpath_list [split $val $separator]
+            set mpath_list [lsearch -inline -all -not -exact $mpath_list $dir]
+            set val [join $mpath_list $separator]
+            set countarr($dir) 0
+            set dir_removed 1
          }
-         set val [join $mpath_list $separator]
       }
-      set countarr($dir) 1
-   } else {
-      foreach dir $path_list {
-         if {![info exists countarr($dir)] || $allow_dup} {
-            # ignore env var set empty if no empty entry found in reference
-            # counter array (sometimes var is cleared by setting it empty not
-            # unsetting it)
-            if {$val ne {} || [info exists countarr()]} {
-               set sep [expr {$val eq $separator ? {} : $separator}]
-               set val [expr {$bhv eq {prepend} ? "$dir$sep$val" :\
-                                  "$val$sep$dir"}]
+      if {![info exists countarr($dir)] || $dir_removed || $allow_dup} {
+         # ignore env var set empty if no empty entry found in reference
+         # counter array (sometimes var is cleared by setting it empty not
+         # unsetting it)
+         if {$val ne {} || [info exists countarr()]} {
+            set sep [expr {$val eq $separator ? {} : $separator}]
+            set val [expr {$bhv eq {prepend} ? "$dir$sep$val" :\
+               "$val$sep$dir"}]
             } else {
                set val $dir
             }
-         }
       }
       if {[info exists countarr($dir)]} {
          # do not increase counter if bare separator string is added or if
@@ -2069,8 +2065,10 @@ proc getModulesEnvVarGlobList {{loaded_ctx 0}} {
    return $envvar_glob_list
 }
 
-# Local Variables:
-# Mode: tcl-mode
-# tcl-indent-level: 3
-# End:
+# ;;; Local Variables:
+# ;;; Mode: tcl-mode
+# ;;; tcl-indent-level: 3
+# ;;; tcl-continued-indent-level: 3
+# ;;; indent-tabs-mode: nil
+# ;;; End:
 # vim:set tabstop=3 shiftwidth=3 expandtab autoindent:

tcl/init.tcl.in

@@ -111,7 +111,7 @@ array set g_config_defs [list\
       alias indesym sym tag hidden key} {} {} eltlist}\
    list_terse_output {MODULES_LIST_TERSE_OUTPUT {@listterseoutput@} 0 l\
       {header idx variant alias indesym sym tag hidden key} {} {} eltlist}\
-   lmod_path_rule {MODULES_LMOD_PATH_RULE 1 0 b {0 1}}\
+   path_entry_reorder {MODULES_PATH_ENTRY_REORDER 1 0 b {0 1}}\
    locked_configs {{} {@lockedconfigs@} 0 o}\
    logged_events {MODULES_LOGGED_EVENTS {@loggedevents@} 1 l {auto_eval\
       requested_eval requested_cmd} {} {} eltlist}\