From bab16cbf0f703d93a8311f7894b3462eca5f9cc2 Mon Sep 17 00:00:00 2001 From: Alan O'Cais Date: Sun, 31 Aug 2025 19:12:17 +0200 Subject: [PATCH 1/5] Initial notification to user that Terms of Use exist --- init/bash | 1 + init/modules/EESSI/2023.06.lua | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/init/bash b/init/bash index 577a2914..16c5a29b 100644 --- a/init/bash +++ b/init/bash @@ -48,5 +48,6 @@ if [ $? -eq 0 ]; then #show_msg "" echo "Environment set up to use EESSI (${EESSI_VERSION}), have fun!" + echo -e "\033[1;33mPlease note that by initializing and using the EESSI software stack,\nyou agree to abide by the EESSI Terms of Use\n(see https://www.eessi.io/docs/governance/terms_of_use/).\033[0m" fi diff --git a/init/modules/EESSI/2023.06.lua b/init/modules/EESSI/2023.06.lua index 755929b2..16588eef 100644 --- a/init/modules/EESSI/2023.06.lua +++ b/init/modules/EESSI/2023.06.lua @@ -189,4 +189,10 @@ end if mode() == "load" then LmodMessage(load_message) + -- notify about ToU + LmodMessage("") + tou_message = "Please note that by initializing and using the EESSI software stack, " + tou_message = tou_message .. "you agree to abide by the EESSI Terms of Use " + tou_message = tou_message .. "(see https://www.eessi.io/docs/governance/terms_of_use/)." + LmodMessage(tou_message) end From 4c756f57b2266d05409e54946210a703908a351e Mon Sep 17 00:00:00 2001 From: Alan O'Cais Date: Mon, 1 Sep 2025 08:19:05 +0200 Subject: [PATCH 2/5] Last line has changed, make checking it looser --- .github/workflows/tests_archdetect_nvidia_gpu.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/tests_archdetect_nvidia_gpu.yml b/.github/workflows/tests_archdetect_nvidia_gpu.yml index 1fe31f5a..87c445fc 100644 --- a/.github/workflows/tests_archdetect_nvidia_gpu.yml +++ b/.github/workflows/tests_archdetect_nvidia_gpu.yml @@ -97,8 +97,8 @@ jobs: grep "Prepending /cvmfs/software.eessi.io/versions/${{matrix.EESSI_VERSION}}/software/linux/x86_64/amd/zen2/accel/nvidia/cc80/modules/all to \$MODULEPATH" init.out || (echo "FAILED 3" && exit 1) fi - echo ">>> checking last line of init output..." - tail -1 init.out | grep "Environment set up to use EESSI (${{matrix.EESSI_VERSION}}), have fun!" || (echo "FAILED, full init utput:" && cat init.out && exit 1) + echo ">>> checking last lines of init output..." + tail -5 init.out | grep "Environment set up to use EESSI (${{matrix.EESSI_VERSION}}), have fun!" || (echo "FAILED, full init output:" && cat init.out && exit 1) echo "All checks on init output PASSED" else From 53daa8e73e863b0e995c87e0c0340a47831af1cb Mon Sep 17 00:00:00 2001 From: Alan O'Cais Date: Mon, 1 Sep 2025 08:48:23 +0200 Subject: [PATCH 3/5] Avoid american/british spelling conundrum --- init/bash | 2 +- init/modules/EESSI/2023.06.lua | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/init/bash b/init/bash index 16c5a29b..259c14a1 100644 --- a/init/bash +++ b/init/bash @@ -48,6 +48,6 @@ if [ $? -eq 0 ]; then #show_msg "" echo "Environment set up to use EESSI (${EESSI_VERSION}), have fun!" - echo -e "\033[1;33mPlease note that by initializing and using the EESSI software stack,\nyou agree to abide by the EESSI Terms of Use\n(see https://www.eessi.io/docs/governance/terms_of_use/).\033[0m" + echo -e "\033[1;33mPlease note that by configuring and using the EESSI software stack,\nyou agree to abide by the EESSI Terms of Use\n(see https://www.eessi.io/docs/governance/terms_of_use/).\033[0m" fi diff --git a/init/modules/EESSI/2023.06.lua b/init/modules/EESSI/2023.06.lua index 16588eef..de3fa90f 100644 --- a/init/modules/EESSI/2023.06.lua +++ b/init/modules/EESSI/2023.06.lua @@ -191,7 +191,7 @@ if mode() == "load" then LmodMessage(load_message) -- notify about ToU LmodMessage("") - tou_message = "Please note that by initializing and using the EESSI software stack, " + tou_message = "Please note that by configuring and using the EESSI software stack, " tou_message = tou_message .. "you agree to abide by the EESSI Terms of Use " tou_message = tou_message .. "(see https://www.eessi.io/docs/governance/terms_of_use/)." LmodMessage(tou_message) From b32d55e162ae9f9ac9aaa65025029cbfbb53cdf5 Mon Sep 17 00:00:00 2001 From: ocaisa Date: Tue, 16 Sep 2025 12:51:43 +0200 Subject: [PATCH 4/5] Update bash Don't use colours, they are not guaranteed to be available --- init/bash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/init/bash b/init/bash index 259c14a1..2312cc45 100644 --- a/init/bash +++ b/init/bash @@ -48,6 +48,6 @@ if [ $? -eq 0 ]; then #show_msg "" echo "Environment set up to use EESSI (${EESSI_VERSION}), have fun!" - echo -e "\033[1;33mPlease note that by configuring and using the EESSI software stack,\nyou agree to abide by the EESSI Terms of Use\n(see https://www.eessi.io/docs/governance/terms_of_use/).\033[0m" + printf "*****\nPlease note that by configuring and using the EESSI software stack,\nyou agree to abide by the EESSI Terms of Use\n(see https://www.eessi.io/docs/governance/terms_of_use/).\n*****\n" fi From 0e27e6ddeb2664ab45f531391721cbeb4a413708 Mon Sep 17 00:00:00 2001 From: Alan O'Cais Date: Wed, 17 Sep 2025 11:37:00 +0200 Subject: [PATCH 5/5] Make the test consistent between the two approaches --- .github/workflows/tests_archdetect_nvidia_gpu.yml | 2 +- init/modules/EESSI/2023.06.lua | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.github/workflows/tests_archdetect_nvidia_gpu.yml b/.github/workflows/tests_archdetect_nvidia_gpu.yml index 87c445fc..faa926fa 100644 --- a/.github/workflows/tests_archdetect_nvidia_gpu.yml +++ b/.github/workflows/tests_archdetect_nvidia_gpu.yml @@ -98,7 +98,7 @@ jobs: fi echo ">>> checking last lines of init output..." - tail -5 init.out | grep "Environment set up to use EESSI (${{matrix.EESSI_VERSION}}), have fun!" || (echo "FAILED, full init output:" && cat init.out && exit 1) + tail -10 init.out | grep "Environment set up to use EESSI (${{matrix.EESSI_VERSION}}), have fun!" || (echo "FAILED, full init output:" && cat init.out && exit 1) echo "All checks on init output PASSED" else diff --git a/init/modules/EESSI/2023.06.lua b/init/modules/EESSI/2023.06.lua index de3fa90f..977cc220 100644 --- a/init/modules/EESSI/2023.06.lua +++ b/init/modules/EESSI/2023.06.lua @@ -190,9 +190,10 @@ end if mode() == "load" then LmodMessage(load_message) -- notify about ToU - LmodMessage("") - tou_message = "Please note that by configuring and using the EESSI software stack, " - tou_message = tou_message .. "you agree to abide by the EESSI Terms of Use " - tou_message = tou_message .. "(see https://www.eessi.io/docs/governance/terms_of_use/)." + tou_message = [[***** +Please note that by configuring and using the EESSI software stack, +you agree to abide by the EESSI Terms of Use +(see https://www.eessi.io/docs/governance/terms_of_use/). +*****]] LmodMessage(tou_message) end