Merge branch 'master' of gitorious.psi.ch:scicomp/psi-modules-buildenvironment

lib/libem.bash

@@ -25,7 +25,7 @@ declare -xr BUILD_TMPDIR="${BUILD_BASEDIR}/tmp"
 declare -xr BUILD_DOWNLOADSDIR="${BUILD_BASEDIR}/Downloads"
 declare -xr BUILD_VERSIONSFILE="${BUILD_CONFIGDIR}/versions.conf"
 
-declare -xr PSI_TEMPLATES_DIR='templates'
+#declare -xr PSI_TEMPLATES_DIR='templates'
 
 if [[ -z "${BUILD_CONFIGDIR}/families.d/"*.conf ]]; then
 	die 1 "Default family configuration not set in ${BUILD_CONFIGDIR}/families.d"
@@ -226,6 +226,7 @@ function _load_build_dependencies() {
 	#         this merge is not as easy as it looks like at a first glance!
 	for m in "${with_modules[@]}"; do
 		if module_is_available "$m"; then
+			echo "Loading module: ${m}"
 			module load "${m}"
 		else
 			die 44 "$m: module not available!"

scripts/Bootstrap/install_pmodules.sh

@@ -25,6 +25,9 @@ install -m 0755 "${SRC_DIR}/modmanage" "${PMODULES_HOME}/bin"
 install -m 0755 "${SRC_DIR}/modmanage.bash" "${PMODULES_HOME}/bin"
 install -m 0755 "${SRC_DIR}/dialog.bash" "${PMODULES_HOME}/bin"
 
+install -m 0755 "${SRC_DIR}/environment.bash" "${PMODULES_HOME}/config"
+install -m 0755 "${SRC_DIR}/profile.bash" "${PMODULES_HOME}/config"
+
 install -m 0644 "${SRC_DIR}/bash" "${PMODULES_HOME}/init"
 install -m 0644 "${SRC_DIR}/bash_completion" "${PMODULES_HOME}/init"