pmodules/Pmodules
2
0
Fork 0
mirror of https://github.com/Pmodules/Pmodules.git synced 2026-08-11 21:40:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

modulecmd: reading the YAML config files reviewed

Browse Source
This commit is contained in:
gsell
2022-06-30 10:43:10 +02:00
parent dcec3671d8
commit 44e5edeebb
1 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Pmodules/libpmodules.bash.in
+18 -6
View File
@@ -79,17 +79,24 @@ pm::read_config(){
# #
# Args: # Args:
# $1 [upvar] result # $1 [upvar] result
local -n fnames="$1"
# user defined via environment variable
if [[ -v PMODULES_OVERLAYS_DEF ]]; then if [[ -v PMODULES_OVERLAYS_DEF ]]; then
test -r "${PMODULES_OVERLAYS_DEF}" || \ test -r "${PMODULES_OVERLAYS_DEF}" || \
std::die 3 \ std::die 3 \
"%s -- %s" \ "%s -- %s" \
"overlay definition file is not readable" \ "overlay definition file is not readable" \
"$_" "$_"
config_files+=("${PMODULES_OVERLAYS_DEF}") fnames+=("${PMODULES_OVERLAYS_DEF}")
fi fi
# user defined
if [[ -r "${HOME}/.Pmodules/Pmodules.yaml" ]]; then if [[ -r "${HOME}/.Pmodules/Pmodules.yaml" ]]; then
config_files+=("${HOME}/.Pmodules/Pmodules.yaml") fnames+=("${HOME}/.Pmodules/Pmodules.yaml")
fi fi
# system config file
test -r "${PMODULES_HOME%%/Tools*}/config/Pmodules.yaml" || \ test -r "${PMODULES_HOME%%/Tools*}/config/Pmodules.yaml" || \
std::die 3 \ std::die 3 \
"%s %s -- %s" \ "%s %s -- %s" \
@@ -97,14 +104,19 @@ pm::read_config(){
"does not exist or is not readable" \ "does not exist or is not readable" \
"$_" "$_"
config_files+=("${PMODULES_HOME%%/Tools*}/config/Pmodules.yaml") fnames+=("${PMODULES_HOME%%/Tools*}/config/Pmodules.yaml")
} }
_get_ol_names(){ _get_ol_names(){
${yq} -Ne eval-all '. as $item ireduce ({}; . *+ $item) |.Overlays|keys()' "${config_files[@]}" | awk '{print $2}' #
# get the names of all overlays
#
local -n fnames="$1"
${yq} -Ne eval-all '. as $item ireduce ({}; . *+ $item) |.Overlays|keys()' \
"${fnames[@]}" | awk '{print $2}'
} }
_get_config_files _get_config_files config_files
eval $(std::parse_yaml "${config_files[-1]}" 'cfg_') eval $(std::parse_yaml "${config_files[-1]}" 'cfg_')
[[ -v cfg_DefaultGroups ]] && DefaultGroups="${cfg_DefaultGroups}" [[ -v cfg_DefaultGroups ]] && DefaultGroups="${cfg_DefaultGroups}"
@@ -119,7 +131,7 @@ pm::read_config(){
# - modulefiles_root default so install_root # - modulefiles_root default so install_root
# - the type defaults to ${ol_normal} # - the type defaults to ${ol_normal}
# #
Overlays=( $(_get_ol_names) ) Overlays=( $(_get_ol_names config_files) )
local ol='' local ol=''
for ol in "${Overlays[@]}"; do for ol in "${Overlays[@]}"; do
eval $(${yq} -Ne eval-all \ eval $(${yq} -Ne eval-all \