From ac3e74795c735eb99acf93e0fe9c024d6d81291a Mon Sep 17 00:00:00 2001
From: ocaisa <alan.ocais@cecam.org>
Date: Wed, 15 May 2024 11:16:49 +0200
Subject: [PATCH] Only correct the Zen4 software subdirectory if it has not
 been overridden

---
 init/eessi_environment_variables | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/init/eessi_environment_variables b/init/eessi_environment_variables
index 71e70ee071..78851a9c95 100644
--- a/init/eessi_environment_variables
+++ b/init/eessi_environment_variables
@@ -52,8 +52,10 @@ if [ -d $EESSI_PREFIX ]; then
         # since optimized software installations for Zen4 are a work-in-progress,
         # see https://gitlab.com/eessi/support/-/issues/37
         if [[ "${EESSI_SOFTWARE_SUBDIR}" == "x86_64/amd/zen4" ]]; then
-            export EESSI_SOFTWARE_SUBDIR="x86_64/amd/zen3"
-            echo -e "\e[33mSticking to ${EESSI_SOFTWARE_SUBDIR} for now, since optimized installations for AMD Genoa (Zen4) are a work in progress, see https://gitlab.com/eessi/support/-/issues/37 for more information\e[0m"
+            if [ -z $EESSI_SOFTWARE_SUBDIR_OVERRIDE ]; then
+                export EESSI_SOFTWARE_SUBDIR="x86_64/amd/zen3"
+                echo -e "\e[33mSticking to ${EESSI_SOFTWARE_SUBDIR} for now, since optimized installations for AMD Genoa (Zen4) are a work in progress, see https://gitlab.com/eessi/support/-/issues/37 for more information\e[0m"
+            fi
         fi
 
         show_msg "Using ${EESSI_SOFTWARE_SUBDIR} as software subdirectory."