Merge branch 'master' into 178-port-cherry-pick-changes-from-version-1-0-0-to-master

This commit is contained in:
2022-12-05 17:09:17 +01:00
2 changed files with 4 additions and 8 deletions
+4 -5
View File
@@ -32,11 +32,10 @@ std::def_cmds "${path}" \
'awk' 'base64' 'find' 'getopt' 'logger' 'mktemp' \
'rm' 'sed' 'sort' 'yq'
if [[ -n ${TCLLIBPATH} ]]; then
declare -x TCLLIBPATH="${PMODULES_HOME}/lib/Pmodules:${TCLLIBPATH}"
else
declare -x TCLLIBPATH="${PMODULES_HOME}/lib/Pmodules"
fi
declare -rx TCL_LIBRARY="${PMODULES_HOME}/lib/tcl@TCL_VERSION@"
declare -x TCLLIBPATH
std::prepend_path TCLLIBPATH "${PMODULES_HOME}/lib/Pmodules"
declare -r modulecmd="${libexecdir}/modulecmd.bin"
declare -- verbosity_lvl=${PMODULES_VERBOSITY:-'verbose'}
-3
View File
@@ -458,9 +458,6 @@ build::install() {
sed "${sed_cmd}" "${SRC_DIR}/modulecmd.bash.in" \
> "${PREFIX}/libexec/modulecmd.bash"
chmod 0755 "${PREFIX}/libexec/modulecmd.bash"
sed "${sed_cmd}" "${SRC_DIR}/modulecmd.tcl.in" \
> "${PREFIX}/libexec/modulecmd.tcl"
chmod 0755 "${PREFIX}/libexec/modulecmd.tcl"
sed "${sed_cmd}" "${SRC_DIR}/libpmodules.bash.in" \
> "${PREFIX}/lib/libpmodules.bash"