From d23fdf930a523796de8562dfb91a76cccd9b6ef1 Mon Sep 17 00:00:00 2001
From: Achim Gsell <achim.gsell@psi.ch>
Date: Wed, 28 Apr 2021 18:52:58 +0200
Subject: [PATCH] Pmodule modulefile: remove Pmodules bin dir from PATH

in some cases it might happen that we have a Pmodules bin directory
in PATH. This has to be removed if we load a Pmodule module.
---
 Pmodules/modulefile | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/Pmodules/modulefile b/Pmodules/modulefile
index 65aa4c1..2a9311d 100644
--- a/Pmodules/modulefile
+++ b/Pmodules/modulefile
@@ -8,3 +8,15 @@ module-maintainer	"Achim Gsell <achim.gsell@psi.ch>"
 module-help	"
 Pmodules are a hierarchical module environment based on Environment Modules.
 "
+
+#
+# It might be that '${PMODULES_ROOT}/Tools/Pmodules/VERSION' is in PATH.
+# Why? With older version the PATH might have been set without loading
+# a module.
+#
+if { [module-info mode load] } {
+    set PATH ":$::env(PATH):"
+    if { [regexp -- {.*:(.*/Pmodules/[^:]*):} $PATH -> str] } {
+    	remove-path PATH $str
+    }
+}