Support dash init shell with Lmod approach, make sure second initialisation gives expected EESSI version

Author: ocaisa

.github/workflows/scripts/test_init_scripts.sh

@@ -26,7 +26,7 @@ if [ ! -d assert.sh ]; then
 fi
 . assert.sh/assert.sh
 
-TEST_SHELLS=("bash" "zsh" "fish" "ksh" "csh")
+TEST_SHELLS=("bash" "zsh" "fish" "ksh" "csh" "sh")
 SHELLS=$@
 
 for shell in ${SHELLS[@]}; do
@@ -139,7 +139,7 @@ for shell in ${SHELLS[@]}; do
     fi
 
     # Optional test 10, check if the prompt has been updated
-    if [ "$shell" = "bash" ] || [ "$shell" = "ksh" ] || [ "$shell" = "zsh" ]; then
+    if [ "$shell" = "bash" ] || [ "$shell" = "ksh" ] || [ "$shell" = "zsh" ] || [ "$shell" = "sh" ]; then
         # Typically this is a non-interactive shell, so manually unset PS1 and reset to a non-exported variable when testing
         TEST_EESSI_PS1_UPDATE=$($shell -c "unset PS1 ; PS1='$ ' ; source init/lmod/$shell 2>/dev/null ; echo \"\$PS1\"")
         TEST_EESSI_NO_PS1_UPDATE=$($shell -c "unset PS1 ; source init/lmod/$shell 2>/dev/null ; echo \"\$PS1\"")

init/lmod/bash

@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/usr/bin/env sh
 
 # SPDX-License-Identifier: GPL-2.0-only
 # Copyright (C) 2020-2026 EESSI contributors
@@ -49,7 +49,12 @@ EESSI_CVMFS_REPO="${EESSI_CVMFS_REPO:-/cvmfs/software.eessi.io}"
 # (Note: in the repository which is home to this file a template value __EESSI_VERSION_DEFAULT__ is present in
 #  the line below which is replaced within our deployment pipeline.)
 EESSI_VERSION_DEFAULT="${__EESSI_VERSION_USED_FOR_INIT:-__EESSI_VERSION_DEFAULT__}"
-EESSI_VERSION="${EESSI_VERSION:-${EESSI_VERSION_DEFAULT}}"
+if [ -z "$__Init_EESSI_Default_Modules" ]; then
+    EESSI_VERSION="${EESSI_VERSION:-${EESSI_VERSION_DEFAULT}}"
+else
+    # If we have already initiaised and this is being called again, then we must want the specific version
+    EESSI_VERSION="__EESSI_VERSION_DEFAULT__"
+fi
 # On the first run we want to record the EESSI version used for init as an environment variable so that if a different
 # version of this script is called (e.g, for a a different EESSI version) it retains a memory which EESSI
 # version was actually used in the initialisation. This is useful as __Init_EESSI_Default_Modules used below will
@@ -75,7 +80,7 @@ if [ -z "$__Init_EESSI_Default_Modules" ]; then
 
     # Lmod version in 2023.06 has a problem with newer Lmod caches, so let's stick to more recent Lmod
     # (has no effect except on Lmod itself, and compatible caches are still created/supported by EESSI)
-    LMOD_EESSI_VERSION=${EESSI_VERSION/2023.06/2025.06}
+    LMOD_EESSI_VERSION=$(printf '%s\n' "$EESSI_VERSION" | sed 's/2023\.06/2025\.06/')
 
     # Let's attempt a purge of any loaded modules as any environment variables currently set will survive EESSI initialisation
     # (it's ok if the module command does not exist)
@@ -96,10 +101,21 @@ if [ -z "$__Init_EESSI_Default_Modules" ]; then
         export EESSI_MODULE_UPDATE_PS1=1
     fi
 
+    # Figure out what shell we have
+    if [ -n "${BASH_VERSION-}" ]; then
+        shell=bash
+    elif [ -n "${ZSH_VERSION-}" ]; then
+        shell=zsh
+    elif [ -n "${KSH_VERSION-}" ]; then
+        shell=ksh
+    else
+        shell=sh
+    fi
+
     # Path to top-level module tree
     # - EESSI_EXTRA_MODULEPATH environment variable allows a site to append to MODULEPATH (lower priority than EESSI MODULEPATH)
     export MODULEPATH="${EESSI_CVMFS_REPO}/init/modules${EESSI_EXTRA_MODULEPATH:+:$EESSI_EXTRA_MODULEPATH}"
-    . "${EESSI_CVMFS_REPO}/versions/${LMOD_EESSI_VERSION}/compat/linux/$(uname -m)/usr/share/Lmod/init/bash"
+    . "${EESSI_CVMFS_REPO}/versions/${LMOD_EESSI_VERSION}/compat/linux/$(uname -m)/usr/share/Lmod/init/${shell}"
     module --initial_load --no_redirect restore
 
     # After initialising, we now know the architecture(s) that was/were selected so let's report them

init/lmod/csh

@@ -20,8 +20,16 @@ if ( ! $?__EESSI_VERSION_USED_FOR_INIT ) then
 else
     set EESSI_VERSION_DEFAULT = "$__EESSI_VERSION_USED_FOR_INIT"
 endif
-if ( ! $?EESSI_VERSION ) then
-    set EESSI_VERSION = "$EESSI_VERSION_DEFAULT"
+if ( ! $?__Init_EESSI_Default_Modules ) then
+    if ( $?EESSI_VERSION ) then
+        # keep existing value
+    else
+        set EESSI_VERSION "$EESSI_VERSION_DEFAULT"
+    endif
+else
+    # If we have already initialised and this is being called again,
+    # then we must want the specific version
+    set EESSI_VERSION "__EESSI_VERSION_DEFAULT__"
 endif
 # On first run, record the EESSI version used for init as an environment variable.
 # We use setenv to ensure it is available to child processes (equivalent to export).

init/lmod/fish

@@ -18,8 +18,16 @@ if not set -q __EESSI_VERSION_USED_FOR_INIT
 else
     set EESSI_VERSION_DEFAULT "$__EESSI_VERSION_USED_FOR_INIT"
 end
-if not set -q EESSI_VERSION
-    set EESSI_VERSION "$EESSI_VERSION_DEFAULT"
+if not set -q __Init_EESSI_Default_Modules
+    if set -q EESSI_VERSION
+        # keep existing value
+    else
+        set EESSI_VERSION $EESSI_VERSION_DEFAULT
+    end
+else
+    # If we have already initialised and this is being called again,
+    # then we must want the specific version
+    set EESSI_VERSION "__EESSI_VERSION_DEFAULT__"
 end
 
 # Record version used for init; -x exports it to the environment

init/lmod/ksh

@@ -0,0 +1 @@
+bash

init/lmod/ksh

@@ -0,0 +1 @@
+bash

init/lmod/sh

@@ -0,0 +1 @@
+bash