From 3fe37f3c5afcae8d38644d98b72d4327d9912d0a Mon Sep 17 00:00:00 2001
From: Achim Gsell <achim.gsell@psi.ch>
Date: Thu, 27 Nov 2025 17:58:41 +0100
Subject: [PATCH] libpmodules: error fixes

---
 CHANGELOG.md                 | 4 ++--
 Pmodules/libpmodules.bash.in | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e5548ed..3961cd5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,7 +4,7 @@
 
 ### modulecmd
 * Misleading error message fixed if system configuration file is not readable.
-  (#1316)
+  (#1316, #1331)
 
 ### build system
 * Function to simplify building modules with pip3 added. 
@@ -14,7 +14,7 @@
   (#1327)
 * default values for `PMODULES_TMPDIR` and `PMODULES_DISTFILESDIR` are now 
   more general.
-  (#1325)
+  (#1325, #1331)
 * set CC and CXX if not defined. This was a bug introduced in 2.0.2
   (#1322)
 
diff --git a/Pmodules/libpmodules.bash.in b/Pmodules/libpmodules.bash.in
index 8ad351a..d6ea4ea 100644
--- a/Pmodules/libpmodules.bash.in
+++ b/Pmodules/libpmodules.bash.in
@@ -451,7 +451,7 @@ pm::read_config(){
 	if [[ -v PMODULES_CONFIG_FILE && -n "${PMODULES_CONFIG_FILE}" ]]; then
 		sys_config_file="${PMODULES_HOME%%/Tools*}/config/${PMODULES_CONFIG_FILE}"
 	fi
-	sys_config_file=$(readlink "${sys_config_file}")
+	sys_config_file=$(readlink -f "${sys_config_file}")
 	test -r "${sys_config_file}" || \
 		std::die 3 \
 			 "%s %s -- %s" \
@@ -472,8 +472,8 @@ pm::read_config(){
 	OverlayInfo[none:type]='n'
 	OverlayInfo[none:layout]='flat'
 
-	PMODULES_DISTFILESDIR=${PMODULES_DISTFILESDIR:-"${DistfilesDir}"}
-	PMODULES_TMPDIR="${PMODULES_TMPDIR:-${TmpDir}"
+	PMODULES_DISTFILESDIR="${PMODULES_DISTFILESDIR:-${DistfilesDir}}"
+	PMODULES_TMPDIR="${PMODULES_TMPDIR:-${TmpDir}}"
 	export PMODULES_DISTFILESDIR PMODULES_TMPDIR
 }