From 912391ac5a02521d3431bc81910a862488b52e4e Mon Sep 17 00:00:00 2001
From: Achim Gsell <achim.gsell@psi.ch>
Date: Tue, 30 May 2017 14:32:46 +0200
Subject: [PATCH] config/environment.bash.{in,psi} - define
 'PMODULES_DISTFILESDIR' and 'PMODULES_TMPDIR' only if still undefined

---
 config/environment.bash.in  | 11 +++++++++--
 config/environment.bash.psi | 11 +++++++++--
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/config/environment.bash.in b/config/environment.bash.in
index 3dd753c..a0dc9b5 100644
--- a/config/environment.bash.in
+++ b/config/environment.bash.in
@@ -19,6 +19,13 @@ declare -x PMODULES_DEFAULT_GROUPS='Tools Programming'
 declare -x PMODULES_DEFINED_RELEASES=':unstable:stable:deprecated:'
 declare -x PMODULES_DEFAULT_RELEASES='stable'
 
-declare -x PMODULES_DISTFILESDIR='@PMODULES_DISTFILESDIR@'
-declare -x PMODULES_TMPDIR="/var/tmp/${USER}"
+if [[ -z ${PMODULES_DISTFILESDIR} ]]; then
+	PMODULES_DISTFILESDIR='@PMODULES_DISTFILESDIR@'
+fi
+declare -x PMODULES_DISTFILESDIR
+
+if [[ -z ${PMODULES_TMPDIR} ]]; then
+	PMODULES_TMPDIR="/var/tmp/${USER}"
+fi
+declare -x PMODULES_TMPDIR
 
diff --git a/config/environment.bash.psi b/config/environment.bash.psi
index 0ab1839..d343a8d 100644
--- a/config/environment.bash.psi
+++ b/config/environment.bash.psi
@@ -19,6 +19,13 @@ declare -x PMODULES_DEFAULT_GROUPS='Tools Programming'
 declare -x PMODULES_DEFINED_RELEASES=':unstable:stable:deprecated:'
 declare -x PMODULES_DEFAULT_RELEASES='stable'
 
-declare -x PMODULES_DISTFILESDIR='/afs/psi.ch/software/Pmodules/distfiles'
-declare -x PMODULES_TMPDIR="/var/tmp/${USER}"
+if [[ -z ${PMODULES_DISTFILESDIR} ]]; then
+	PMODULES_DISTFILESDIR='/afs/psi.ch/software/Pmodules/distfiles'
+fi
+declare -x PMODULES_DISTFILESDIR
+
+if [[ -z ${PMODULES_TMPDIR} ]]; then
+	PMODULES_TMPDIR="/var/tmp/${USER}"
+fi
+declare -x PMODULES_TMPDIR