diff --git a/Pmodules/libpmodules.bash.in b/Pmodules/libpmodules.bash.in index 06c9c32..8b6992b 100644 --- a/Pmodules/libpmodules.bash.in +++ b/Pmodules/libpmodules.bash.in @@ -95,7 +95,7 @@ pm::read_config(){ } _get_ol_names(){ - yq -Ne eval-all '. as $item ireduce ({}; . *+ $item) |.Overlays|keys()' "${config_files[@]}" | awk '{print $2}' + ${yq} -Ne eval-all '. as $item ireduce ({}; . *+ $item) |.Overlays|keys()' "${config_files[@]}" | awk '{print $2}' } _get_config_files @@ -109,7 +109,7 @@ pm::read_config(){ Overlays=( $(_get_ol_names) ) local ol='' for ol in "${Overlays[@]}"; do - eval $(yq -Ne eval-all \ + eval $(${yq} -Ne eval-all \ ". as \$item ireduce ({}; . *+ \$item) |.Overlays.${ol}" \ "${config_files[@]}" | \ sed 's/: /=/; s/\(.*\)/local \1/') diff --git a/Pmodules/modulecmd.bash.in b/Pmodules/modulecmd.bash.in index c865fba..d25f34d 100644 --- a/Pmodules/modulecmd.bash.in +++ b/Pmodules/modulecmd.bash.in @@ -31,7 +31,7 @@ path="/bin:/usr/bin" [[ ${os_name} == 'Darwin' ]] && path="${libexecdir}:${path}" std::def_cmds "${path}" \ 'awk' 'base64' 'find' 'getopt' 'logger' 'mktemp' \ - 'rm' 'sort' 'find' + 'rm' 'sort' 'find' 'yq' if [[ ${PMODULES_PURETCL} == yes ]]; then declare -r modulecmd="${libexecdir}/modulecmd.tcl"