From f6c83d9ee03c1b98f3828ce5604460a84e62e396 Mon Sep 17 00:00:00 2001 From: Achim Gsell Date: Mon, 16 Jan 2023 11:23:33 +0100 Subject: [PATCH 1/2] modbuild: PMODULES_{TMP,DISTFILESDIR} environment variables The environment variables PMODULES_TMPDIR and PMODULES_DISTFILESDIR can now be used to override the values in the configuration file. --- Pmodules/modbuild.in | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/Pmodules/modbuild.in b/Pmodules/modbuild.in index c202e03..f374ba5 100755 --- a/Pmodules/modbuild.in +++ b/Pmodules/modbuild.in @@ -24,20 +24,18 @@ else fi PATH+='/usr/bin:/bin:/usr/sbin:/sbin' PATH+=":${mydir}" -PATH+=":${mydir}/../lib:${mydir}/../config" +PATH+=":${mydir}/../lib" + +# path of config files +PATH+=":${mydir}/../config" source libstd.bash || { echo "Oops: cannot source library -- '$_'" 1>&2; exit 3; } - -# can be set in the configuration file -declare PMODULES_DISTFILESDIR='' -declare PMODULES_TMPDIR='' - source libpbuild.bash || \ std::die 3 "Oops: cannot source library -- '$_'" -# save arguments, (still) required for building dependencies +# save arguments, required for building dependencies declare -r ARGS="$@" ############################################################################## From d162ffc916fbf0f1e839bacc513aa12481433c49 Mon Sep 17 00:00:00 2001 From: Achim Gsell Date: Mon, 16 Jan 2023 11:24:07 +0100 Subject: [PATCH 2/2] CHANGELOG updated --- CHANGELOG.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index dd1ee69..bfb02fa 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,7 +6,9 @@ full path of the modulefile and the user name. * modulecmd is now relocatable using the environment variable `PMODULES_HOME` - * experimental support for modulecmd written in Tcl has been removed. + * experimental support for modulecmd written in Tcl removed. + * The environment variable `PMODULES_TMPDIR` and `PMODILES_DISTFILESDIR` + can now be used to override the values set in the configuration file. ## Version 1.0.0rc13 * same as 1.0.0rc12 but compiled on SL6