Merge branch 'master' into 32-overlay-implementation

Conflicts:
	Pmodules/libmodules.tcl
	Pmodules/modulecmd.bash.in
	Tools/tcllib/build
This commit is contained in:
2021-06-02 23:18:40 +02:00
13 changed files with 278 additions and 245 deletions
+3
View File
@@ -495,6 +495,9 @@ pmodules::install() {
sed "${sed_cmd}" "${SRC_DIR}/modmanage.bash.in" > "${PMODULES_HOME}/libexec/modmanage.bash"
chmod 0755 "${PMODULES_HOME}/libexec/modmanage.bash"
test -e "${PMODULES_ROOT}/${CONFIG_DIR}/Pmodules.conf" || \
install -m 0644 "${SRC_DIR}/Pmodules.conf" "${PMODULES_ROOT}/${CONFIG_DIR}"
install -m 0644 "${SRC_DIR}/bash" "${PMODULES_HOME}/init"
install -m 0644 "${SRC_DIR}/bash_completion" "${PMODULES_HOME}/init"
install -m 0644 "${SRC_DIR}/csh" "${PMODULES_HOME}/init"