From e322646e016c3d12e6e1817bdc06596ff8d899a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bob=20Dr=C3=B6ge?= <b.e.droge@rug.nl>
Date: Fri, 24 Oct 2025 16:15:59 +0200
Subject: [PATCH 1/3] set EESSI_VERSION early, use it everywhere

---
 init/eessi_defaults | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/init/eessi_defaults b/init/eessi_defaults
index f8265347..6294ef9a 100644
--- a/init/eessi_defaults
+++ b/init/eessi_defaults
@@ -10,11 +10,11 @@
 
 export EESSI_VERSION_DEFAULT='__EESSI_VERSION_DEFAULT__'
 
+export EESSI_VERSION="${EESSI_VERSION_OVERRIDE:=${EESSI_VERSION_DEFAULT}}"
+
 # use different defaults for RISC-V clients
 if [[ $(uname -m) == "riscv64" ]]; then
-    export EESSI_VERSION="${EESSI_VERSION_OVERRIDE:-${EESSI_VERSION_DEFAULT}}"
     if [[ "${EESSI_VERSION}" == "2023.06" ]] || [[ "${EESSI_VERSION}" == "20240402" ]]; then
-        export EESSI_VERSION="${EESSI_VERSION_OVERRIDE:=20240402}"
         export EESSI_CVMFS_REPO="${EESSI_CVMFS_REPO_OVERRIDE:=/cvmfs/riscv.eessi.io}"
         export EESSI_INIT_PREFIX="${EESSI_CVMFS_REPO}/versions/${EESSI_VERSION}/init"
         if [[ -z ${EESSI_SILENT+x} ]]; then
@@ -23,7 +23,7 @@ if [[ $(uname -m) == "riscv64" ]]; then
             echo "For more details about this repository, see https://www.eessi.io/docs/repositories/riscv.eessi.io/."
             echo ""
         fi
-    elif [[ "${EESSI_VERSION_DEFAULT}" == "2025.06" ]]; then
+    elif [[ "${EESSI_VERSION}" == "2025.06"* ]]; then
         export EESSI_CVMFS_REPO="${EESSI_CVMFS_REPO_OVERRIDE:=/cvmfs/dev.eessi.io/riscv}"
         export EESSI_COMPAT_LAYER_DIR="/cvmfs/software.eessi.io/versions/${EESSI_VERSION_DEFAULT}/compat/linux/$(uname -m)"
         export EESSI_INIT_PREFIX="/cvmfs/software.eessi.io/versions/${EESSI_VERSION_DEFAULT}/init"
@@ -34,7 +34,6 @@ if [[ $(uname -m) == "riscv64" ]]; then
     fi
 else
     export EESSI_CVMFS_REPO="${EESSI_CVMFS_REPO_OVERRIDE:=/cvmfs/software.eessi.io}"
-    export EESSI_VERSION="${EESSI_VERSION_OVERRIDE:=${EESSI_VERSION_DEFAULT}}"
     export EESSI_INIT_PREFIX="${EESSI_CVMFS_REPO}/versions/${EESSI_VERSION}/init"
 fi
 # use archdetect by default, unless otherwise specified

From 4965953a1efd3834097bbca72c582bdb87159d85 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bob=20Dr=C3=B6ge?= <b.e.droge@rug.nl>
Date: Fri, 24 Oct 2025 16:16:58 +0200
Subject: [PATCH 2/3] add comment about version suffixes

---
 init/eessi_defaults | 1 +
 1 file changed, 1 insertion(+)

diff --git a/init/eessi_defaults b/init/eessi_defaults
index 6294ef9a..8cfbf88d 100644
--- a/init/eessi_defaults
+++ b/init/eessi_defaults
@@ -23,6 +23,7 @@ if [[ $(uname -m) == "riscv64" ]]; then
             echo "For more details about this repository, see https://www.eessi.io/docs/repositories/riscv.eessi.io/."
             echo ""
         fi
+    # allow for version suffixes in 2025.06 (e.g. 2025.06-001)
     elif [[ "${EESSI_VERSION}" == "2025.06"* ]]; then
         export EESSI_CVMFS_REPO="${EESSI_CVMFS_REPO_OVERRIDE:=/cvmfs/dev.eessi.io/riscv}"
         export EESSI_COMPAT_LAYER_DIR="/cvmfs/software.eessi.io/versions/${EESSI_VERSION_DEFAULT}/compat/linux/$(uname -m)"

From 292f4e65d876abe235e37e41de4448079f0c6fb4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bob=20Dr=C3=B6ge?= <b.e.droge@rug.nl>
Date: Fri, 24 Oct 2025 17:06:28 +0200
Subject: [PATCH 3/3] use EESSI_VERSION instead of EESSI_VERSION_DEFAULT

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

diff --git a/init/eessi_defaults b/init/eessi_defaults
index 8cfbf88d..05bcb5c8 100644
--- a/init/eessi_defaults
+++ b/init/eessi_defaults
@@ -1,4 +1,3 @@
-# define default values for some EESSI_* environment variables
 #
 # This file is part of the EESSI software layer,
 # see https://github.com/EESSI/software-layer
@@ -23,11 +22,10 @@ if [[ $(uname -m) == "riscv64" ]]; then
             echo "For more details about this repository, see https://www.eessi.io/docs/repositories/riscv.eessi.io/."
             echo ""
         fi
-    # allow for version suffixes in 2025.06 (e.g. 2025.06-001)
     elif [[ "${EESSI_VERSION}" == "2025.06"* ]]; then
         export EESSI_CVMFS_REPO="${EESSI_CVMFS_REPO_OVERRIDE:=/cvmfs/dev.eessi.io/riscv}"
-        export EESSI_COMPAT_LAYER_DIR="/cvmfs/software.eessi.io/versions/${EESSI_VERSION_DEFAULT}/compat/linux/$(uname -m)"
-        export EESSI_INIT_PREFIX="/cvmfs/software.eessi.io/versions/${EESSI_VERSION_DEFAULT}/init"
+        export EESSI_COMPAT_LAYER_DIR="/cvmfs/software.eessi.io/versions/${EESSI_VERSION}/compat/linux/$(uname -m)"
+        export EESSI_INIT_PREFIX="/cvmfs/software.eessi.io/versions/${EESSI_VERSION}/init"
         if [[ -z ${EESSI_SILENT+x} ]]; then
             echo "This EESSI production version only provides a RISC-V compatibility layer,"
             echo "software installations are provided by the EESSI development repository at ${EESSI_CVMFS_REPO}."