From 1c98c1268424f8cac1b4d2edb032dde183797591 Mon Sep 17 00:00:00 2001 From: Achim Gsell Date: Tue, 24 May 2022 11:52:35 +0200 Subject: [PATCH] some varibales renamed - OverlayList -> UsedOverlays - OverlayDict -> OverlayInfo --- Pmodules/libmodules.tcl | 22 ++++---- Pmodules/libpmodules.bash.in | 16 +++--- Pmodules/modbuild.in | 4 +- Pmodules/modulecmd.bash.in | 106 +++++++++++++++++------------------ 4 files changed, 74 insertions(+), 74 deletions(-) diff --git a/Pmodules/libmodules.tcl b/Pmodules/libmodules.tcl index b4ef6e2..7a82ba3 100644 --- a/Pmodules/libmodules.tcl +++ b/Pmodules/libmodules.tcl @@ -43,15 +43,15 @@ proc _pmodules_parse_pmodules_env { } { Dir2OverlayMap { array set ::Dir2OverlayMap [regsub -all {[]=[]} $value " "] } - OverlayDict { - array set ::OverlayDict [regsub -all {[]=[]} $value " "] + OverlayInfo { + array set ::OverlayInfo [regsub -all {[]=[]} $value " "] } - OverlayList { + UsedOverlays { array set tmp [regsub -all {[]=[]} $value " "] - set ::OverlayList {} + set ::UsedOverlays {} set l [lsort [array names tmp]] foreach k $l { - lappend ::OverlayList $tmp($k) + lappend ::UsedOverlays $tmp($k) } } UsedGroups { @@ -79,9 +79,9 @@ proc module-addgroup { group } { if { [module-info mode load] } { set overlays_to_add {} - foreach overlay $::OverlayList { + foreach overlay $::UsedOverlays { lappend overlays_to_add $overlay - set ol_type [lindex [split $::OverlayDict($overlay) ":"] 0] + set ol_type [lindex [split $::OverlayInfo($overlay) ":"] 0] if { [string compare $ol_type $::ol_replacing] == 0 } { break } @@ -122,7 +122,7 @@ proc module-addgroup { group } { debug "mode=remove: no orphan modules to unload" } debug "mode=remove: $env(MODULEPATH)" - foreach overlay $::OverlayList { + foreach overlay $::UsedOverlays { set dir [file join \ $overlay \ $group \ @@ -325,9 +325,9 @@ proc ModulesHelp { } { # proc _find_overlay { modulefile_components } { debug "_find_overlay()" - foreach ol $::OverlayList { + foreach ol $::UsedOverlays { debug "$ol" - set ol_dir $::OverlayDict(${ol}:mod_root) + set ol_dir $::OverlayInfo(${ol}:mod_root) if { [string range $ol_dir end end] == "/" } { set ol_dir [string range $ol_dir 0 end-1] } @@ -388,7 +388,7 @@ proc _pmodules_init_global_vars { } { debug "mod_root=$mod_root" set ol $::Dir2OverlayMap($mod_root) debug "ol=$ol" - set install_prefix [file split $::OverlayDict(${ol}:inst_root)] + set install_prefix [file split $::OverlayInfo(${ol}:inst_root)] set prefix "$install_prefix $group [lreverse_n $variant 2]" set PREFIX [file join {*}$prefix] debug "PREFIX=$PREFIX" diff --git a/Pmodules/libpmodules.bash.in b/Pmodules/libpmodules.bash.in index 8801f39..4ec0d1d 100644 --- a/Pmodules/libpmodules.bash.in +++ b/Pmodules/libpmodules.bash.in @@ -8,9 +8,9 @@ declare -A Options=() declare -A Help=() declare -a Overlays=() -declare -A OverlayDict -declare -a OverlayList -declare -Ag Dir2OverlayMap +declare -A OverlayInfo +declare -a UsedOverlays +declare -A Dir2OverlayMap declare -r ol_normal='n' declare -r ol_hiding='h' @@ -61,7 +61,7 @@ compute_group_depth () { scan_groups () { local ol for ol in "$@"; do - local mod_root="${OverlayDict[${ol}:mod_root]}" + local mod_root="${OverlayInfo[${ol}:mod_root]}" local moduledir for moduledir in ${mod_root}/*/${PMODULES_MODULEFILES_DIR}; do compute_group_depth "${moduledir}" @@ -128,23 +128,23 @@ pm::read_config(){ std::die 3 "Invalid type for overlay '${ol}' -- ${type}" ;; esac - OverlayDict[${ol}:type]="${type}" + OverlayInfo[${ol}:type]="${type}" : ${modulefiles_root:=${PMODULES_HOME%%/Tools*}} [[ -d ${modulefiles_root} ]] || \ std::die 3 \ "Invalid modulefiles root directory for overlay '${ol}' -- ${modulefiles_root}" : ${modulefiles_root:=${PMODULES_HOME%%/Tools*}} - OverlayDict[${ol}:mod_root]="${modulefiles_root}" + OverlayInfo[${ol}:mod_root]="${modulefiles_root}" Dir2OverlayMap[${modulefiles_root}]="${ol}" : ${install_root:=${PMODULES_HOME%%/Tools*}} [[ -d ${install_root} ]] || \ std::die 3 \ "Invalid installation root directory for overlay '${ol}' -- ${install_root}" - OverlayDict[${ol}:inst_root]="${install_root:-${PMODULES_HOME%%/Tools*}}" + OverlayInfo[${ol}:inst_root]="${install_root:-${PMODULES_HOME%%/Tools*}}" - OverlayDict[${ol}:used]='no' + OverlayInfo[${ol}:used]='no' unset type modulefiles_root install_root done } diff --git a/Pmodules/modbuild.in b/Pmodules/modbuild.in index 5039ce1..7318673 100755 --- a/Pmodules/modbuild.in +++ b/Pmodules/modbuild.in @@ -531,8 +531,8 @@ build_modules_yaml(){ yaml_get_relstage relstage "${fname}" "${v}" $i yaml_get_overlay ol_name "${fname}" "${v}" $i yaml_get_dependencies deps "${fname}" "${v}" $i - ol_install_dir="${OverlayDict[${ol_name}:inst_root]}" - ol_dir="${OverlayDict[${ol_name}:mod_root]}" + ol_install_dir="${OverlayInfo[${ol_name}:inst_root]}" + ol_dir="${OverlayInfo[${ol_name}:mod_root]}" if (( ${#deps[@]} > 0 )); then while read -a with_modules; do diff --git a/Pmodules/modulecmd.bash.in b/Pmodules/modulecmd.bash.in index 688dbc9..65d17a7 100644 --- a/Pmodules/modulecmd.bash.in +++ b/Pmodules/modulecmd.bash.in @@ -127,8 +127,8 @@ save_env() { vars+=( ReleaseStages ) vars+=( GroupDepths ) vars+=( Overlays ) - vars+=( OverlayList ) - vars+=( OverlayDict Dir2OverlayMap) + vars+=( UsedOverlays ) + vars+=( OverlayInfo Dir2OverlayMap) local s=$(typeset -p ${vars[@]}) declare -gx PMODULES_ENV=$( encode_base64 "$s" ) @@ -158,8 +158,8 @@ map_moduledir2ol_name() { if [[ ! -v Dir2OverlayMap[${moduledir}] ]]; then local ol - for ol in "${OverlayList[@]}" 'other'; do - local mod_root="${OverlayDict[${ol}:mod_root]}" + for ol in "${UsedOverlays[@]}" 'other'; do + local mod_root="${OverlayInfo[${ol}:mod_root]}" [[ ${moduledir} == ${mod_root}/* ]] && break done Dir2OverlayMap[${moduledir}]="${ol}" @@ -170,8 +170,8 @@ map_moduledir2ol_name() { # # get release stage of module # Note: -# - the release stage of a module outside ${OverlayDict[@]} is always 'stable' -# - the release stage of a module inside ${OverlayDict[@]} without a +# - the release stage of a module outside ${OverlayInfo[@]} is always 'stable' +# - the release stage of a module inside ${OverlayInfo[@]} without a # coresponding file is always 'unstable' # # Args: @@ -231,7 +231,7 @@ find_overlay () { [[ "${ol}" == 'other' ]] && return 1 - local group="${path#${OverlayDict[${ol}:mod_root]}/}" + local group="${path#${OverlayInfo[${ol}:mod_root]}/}" group=${group%%/*} std::upvar $2 "${group}" return 0 @@ -497,8 +497,8 @@ subcommand_load() { local "$1" local -r group="$2/${PMODULES_MODULEFILES_DIR}" local ol - for ol in "${OverlayList[@]}"; do - local inst_root="${OverlayDict[${ol}:inst_root]}" + for ol in "${UsedOverlays[@]}"; do + local inst_root="${OverlayInfo[${ol}:inst_root]}" if [[ -d "${inst_root}/${group}" ]]; then std::upvar $1 "${ol}" return 0 @@ -511,7 +511,7 @@ subcommand_load() { [[ -n ${group} ]] && [[ -n ${GroupDepths[${group}]} ]] && return 0 local ol='' find_overlay_with_group ol "${group}" || return 1 - local moduledir="${OverlayDict[${ol}:mod_root]}/${group}/${PMODULES_MODULEFILES_DIR}" + local moduledir="${OverlayInfo[${ol}:mod_root]}/${group}/${PMODULES_MODULEFILES_DIR}" compute_group_depth "${moduledir}" || return 1 g_env_must_be_saved='yes' } @@ -612,8 +612,8 @@ subcommand_load() { MODULEPATH="" modulepath=() group+="${PMODULES_MODULEFILES_DIR}" - for overlay in "${OverlayList[@]}"; do - local mod_root="${OverlayDict[${overlay}:mod_root]}" + for overlay in "${UsedOverlays[@]}"; do + local mod_root="${OverlayInfo[${overlay}:mod_root]}" MODULEPATH="${mod_root}/${group}/:${MODULEPATH}" modulepath=( "${mod_root}/${group}/" "${modulepath[@]}" ) done @@ -949,7 +949,7 @@ get_available_modules() { local name="${mod%/*}" local key="${dir##/${PMODULES_MODULEFILES_DIR}}/${name}" if [[ -z "${modulenames[${key}]}" ]]; then - if [[ "${OverlayDict[${ol}:type]}" == "${ol_hiding}" ]]; then + if [[ "${OverlayInfo[${ol}:type]}" == "${ol_hiding}" ]]; then modulenames[${key}]="${ol}" else modulenames[${key}]='0' @@ -1352,9 +1352,9 @@ subcommand_use() { local only_used="$1" local ol='' for ol in "${Overlays[@]}"; do - [[ ${OverlayDict[${ol}:used]} == ${only_used} ]] || continue - local inst_root="${OverlayDict[${ol}:inst_root]}" - local mod_root="${OverlayDict[${ol}:mod_root]}" + [[ ${OverlayInfo[${ol}:used]} == ${only_used} ]] || continue + local inst_root="${OverlayInfo[${ol}:inst_root]}" + local mod_root="${OverlayInfo[${ol}:mod_root]}" local txt="\t${ol}" if [[ ${inst_root} == ${mod_root} ]]; then txt+="\n\t\t${inst_root}" @@ -1362,7 +1362,7 @@ subcommand_use() { txt+="\n\t\t${inst_root} (install root)" txt+="\n\t\t${mod_root} (modulefiles root)" fi - case "${OverlayDict[${ol}:type]}" in + case "${OverlayInfo[${ol}:type]}" in "${ol_hiding}" ) txt+='\n\t\t(hiding modules with same name)' ;; @@ -1441,7 +1441,7 @@ subcommand_use() { "modules are already loaded!" fi - if [[ ${OverlayDict[${ol_name}:used]} == 'yes' ]]; then + if [[ ${OverlayInfo[${ol_name}:used]} == 'yes' ]]; then std::die 3 "%s %s: %s -- %s" \ "${CMD}" "${subcommand}" \ "overlay already in use" \ @@ -1449,27 +1449,27 @@ subcommand_use() { return 0 fi - if [[ "${OverlayDict[${ol_name}:type]}" == "${ol_replacing}" ]]; then + if [[ "${OverlayInfo[${ol_name}:type]}" == "${ol_replacing}" ]]; then # if this overlay replaces groups, we have # to remove the modules made available by # other overlays in these groups for group in ${UsedGroups//:/ }; do # is this group in the to be added overlay? - local dir="${OverlayDict[${ol_name}:mod_root]}/" + local dir="${OverlayInfo[${ol_name}:mod_root]}/" dir+="${group}/${PMODULES_MODULEFILES_DIR}" [[ -d "${dir}" ]] || continue # no dir="/${group}/${PMODULES_MODULEFILES_DIR}" local -a dirs=() - for ol in "${OverlayList[@]}"; do - dirs+=( ${OverlayDict[${ol}:mod_root]}${dir} ) + for ol in "${UsedOverlays[@]}"; do + dirs+=( ${OverlayInfo[${ol}:mod_root]}${dir} ) done std::remove_path MODULEPATH "${dirs[@]}" done fi for group in ${UsedGroups//:/ }; do - local dir="${OverlayDict[${ol_name}:mod_root]}/" + local dir="${OverlayInfo[${ol_name}:mod_root]}/" dir+="${group}/${PMODULES_MODULEFILES_DIR}" if [[ -d "${dir}" ]]; then std::prepend_path MODULEPATH "${dir}" @@ -1477,11 +1477,11 @@ subcommand_use() { fi done - OverlayList=( "${ol_name}" "${OverlayList[@]}" ) - OverlayDict[${ol_name}:used]='yes' - export_env OverlayList + UsedOverlays=( "${ol_name}" "${UsedOverlays[@]}" ) + OverlayInfo[${ol_name}:used]='yes' + export_env UsedOverlays g_env_must_be_saved='yes' - scan_groups "${OverlayList[@]}" + scan_groups "${UsedOverlays[@]}" } #.............................................................. @@ -1495,13 +1495,13 @@ subcommand_use() { fi std::append_path UsedGroups "$1" local ol_name - for ol_name in "${OverlayList[@]}"; do - local dir="${OverlayDict[${ol_name}:mod_root]}/$1/${PMODULES_MODULEFILES_DIR}" + for ol_name in "${UsedOverlays[@]}"; do + local dir="${OverlayInfo[${ol_name}:mod_root]}/$1/${PMODULES_MODULEFILES_DIR}" [[ -d "${dir}" ]] || continue std::prepend_path MODULEPATH "${dir}" Dir2OverlayMap[${dir}]=${ol_name} - [[ "${OverlayDict[${ol_name}:type]}" == "${ol_replacing}" ]] && break + [[ "${OverlayInfo[${ol_name}:type]}" == "${ol_replacing}" ]] && break done } @@ -1518,7 +1518,7 @@ subcommand_use() { UsedFlags+=( "${arg/flag=}" ) return fi - if [[ -v OverlayDict[${arg}:type] ]]; then + if [[ -v OverlayInfo[${arg}:type] ]]; then use_overlay "${arg}" return 0 fi @@ -1529,7 +1529,7 @@ subcommand_use() { if [[ ! -v GroupDepths[${arg}] ]]; then # this scan is required if a new group has been # create inside an used overlay - scan_groups "${!OverlayDict[@]}" + scan_groups "${!OverlayInfo[@]}" g_env_must_be_saved='yes' fi if [[ -n ${GroupDepths[${arg}]} ]]; then @@ -1611,46 +1611,46 @@ subcommand_unuse() { "some modules are still loaded!" fi - [[ "${OverlayDict[ol_name]:mod_root}" == "${PMODULES_HOME%%/Tools*}" ]] && \ + [[ "${OverlayInfo[ol_name]:mod_root}" == "${PMODULES_HOME%%/Tools*}" ]] && \ std::die 3 "%s %s: %s -- %s" \ "${CMD}" "${subcommand}" \ "cannot remove base overlay" \ "${ol_name}" - [[ ${OverlayDict[${ol_name}:used]} != 'yes' ]] && \ + [[ ${OverlayInfo[${ol_name}:used]} != 'yes' ]] && \ std::die 3 "%s %s: %s -- %s" \ "${CMD}" "${subcommand}" \ "not an used overlay" \ "${ol_name}" # make sure first index is '0' (it should, but you never know) - OverlayList=( "${OverlayList[@]}" ) - [[ "${ol_name}" != "${OverlayList[0]}" ]] && \ + UsedOverlays=( "${UsedOverlays[@]}" ) + [[ "${ol_name}" != "${UsedOverlays[0]}" ]] && \ std::die 3 "%s %s: %s %s -- %s" \ "${CMD}" "${subcommand}" \ "overlay cannot be removed since" \ "it not on top of the stack" \ "${ol_name}" - if [[ "${OverlayDict[${ol_name}:type]}" == "${ol_replacing}" ]]; then + if [[ "${OverlayInfo[${ol_name}:type]}" == "${ol_replacing}" ]]; then # if this overlay hides groups, we have to re-add # the modules made available by other overlays - local mod_root=${OverlayDict[${ol_name}:mod_root]} + local mod_root=${OverlayInfo[${ol_name}:mod_root]} for group in ${UsedGroups//:/ }; do # is this group in the to be removed overlay? local dir="${mod_root}/${group}/${PMODULES_MODULEFILES_DIR}" [[ -d "${dir}" ]] || continue # no dir="/${group}/${PMODULES_MODULEFILES_DIR}" - std::prepend_path MODULEPATH "${OverlayList[@]/%/${dir}}" + std::prepend_path MODULEPATH "${UsedOverlays[@]/%/${dir}}" done fi - OverlayDict[${ol_name}:used]='no' - OverlayList=( "${OverlayList[@]:1}") + OverlayInfo[${ol_name}:used]='no' + UsedOverlays=( "${UsedOverlays[@]:1}") g_env_must_be_saved='yes' - export_env OverlayList + export_env UsedOverlays local dir for dir in "${modulepath[@]}"; do - [[ "${dir}" =~ "${OverlayDict[${ol_name}:mod_root]}" ]] && \ + [[ "${dir}" =~ "${OverlayInfo[${ol_name}:mod_root]}" ]] && \ std::remove_path MODULEPATH "${dir}" done } @@ -1674,7 +1674,7 @@ subcommand_unuse() { fi std::remove_path UsedGroups "${arg}" local overlay - for overlay in "${OverlayList[@]}"; do + for overlay in "${UsedOverlays[@]}"; do local dir="${overlay}/${arg}/${PMODULES_MODULEFILES_DIR}" std::remove_path MODULEPATH "${dir}" done @@ -1697,7 +1697,7 @@ subcommand_unuse() { done return fi - if [[ -v OverlayDict[${arg}:type] ]]; then + if [[ -v OverlayInfo[${arg}:type] ]]; then unuse_overlay "${arg}" return 0 fi @@ -1792,9 +1792,9 @@ init_modulepath() { declare -gx MODULEPATH='' local group local ol - for ol in "${OverlayList[@]}"; do + for ol in "${UsedOverlays[@]}"; do for group in ${UsedGroups//:/ }; do - local dir="${OverlayDict[${ol}:mod_root]}/${group}/${PMODULES_MODULEFILES_DIR}" + local dir="${OverlayInfo[${ol}:mod_root]}/${group}/${PMODULES_MODULEFILES_DIR}" if [[ -d "${dir}" ]]; then std::prepend_path MODULEPATH "${dir}" Dir2OverlayMap[${dir}]="${ol}" @@ -2402,7 +2402,7 @@ subcommand_search() { shift done if [[ -z "${src_prefix}" ]]; then - local -a src_prefix=( "${OverlayList[@]}" ) + local -a src_prefix=( "${UsedOverlays[@]}" ) fi if [[ "${opt_use_rel_stages}" == ":" ]]; then @@ -2738,13 +2738,13 @@ if [[ -z "${Subcommands[${subcommand}]}" ]]; then fi init_overlay_vars() { - declare -ag OverlayList=( 'base' ) - OverlayDict['base:used']='yes' + declare -ag UsedOverlays=( 'base' ) + OverlayInfo['base:used']='yes' #declare -Ag Dir2OverlayMap=() - for ol in "${OverlayList[@]}"; do + for ol in "${UsedOverlays[@]}"; do local group for group in ${UsedGroups//:/ }; do - local dir="${OverlayDict[${ol}:mod_root]}/${group}/${PMODULES_MODULEFILES_DIR}" + local dir="${OverlayInfo[${ol}:mod_root]}/${group}/${PMODULES_MODULEFILES_DIR}" if [[ -d "${dir}" ]]; then Dir2OverlayMap[${dir}]=${ol} fi @@ -2818,7 +2818,7 @@ fi #fi if (( ${#GroupDepths[@]} == 0 )); then - scan_groups "${OverlayList[@]}" + scan_groups "${UsedOverlays[@]}" g_env_must_be_saved='yes' fi