Skip to content

fix EESSI prefix for complex prompts #196

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ocaisa merged 25 commits into from
Apr 15, 2026
Merged

fix EESSI prefix for complex prompts #196

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
c71427e
fix {EESSI/...} prefix for complex prompts
smoors Apr 3, 2026
aa8a19c
define prefix
smoors Apr 3, 2026
8b750c8
Merge branch 'main' into ps1
ocaisa Apr 7, 2026
648ac50
Fix copying of the buildlogs broken by the introduction of pre-run-sh…
laraPPr Apr 8, 2026
ffc9f0f
Fix copying of the buildlogs broken by the introduction of pre-run-sh…
laraPPr Apr 8, 2026
4fd7205
fix typo
laraPPr Apr 8, 2026
c2d96ef
use match instead of reverse match
laraPPr Apr 8, 2026
3d7d8a6
add check if file exhists
laraPPr Apr 8, 2026
7399741
fix identation
laraPPr Apr 8, 2026
3112284
Update EESSI-install-software.sh
laraPPr Apr 8, 2026
c2515ff
Apply suggestion from @ocaisa
ocaisa Apr 8, 2026
022cac9
Also set REQUESTS_CA_BUNDLE,SSL_CERT_FILE on RHEL-like systems
ocaisa Apr 10, 2026
3240ad7
add tests
smoors Apr 13, 2026
38ceb02
Merge branch 'main' into ps1
ocaisa Apr 13, 2026
344b4a3
fix
smoors Apr 13, 2026
13da616
fix
smoors Apr 13, 2026
0eb5394
make sure we use current sources as EESSI_CVMFS_REPO
smoors Apr 15, 2026
1928e7a
try ignoring the cache
smoors Apr 15, 2026
6549478
fix init script for the test
smoors Apr 15, 2026
7094564
fix
smoors Apr 15, 2026
c6a29cd
another try
smoors Apr 15, 2026
60a53a7
another try
smoors Apr 15, 2026
b7792e1
fix
smoors Apr 15, 2026
680f29a
make sure it works for zsh too
smoors Apr 15, 2026
66f1bc0
Use EESSI module from repo for all PS1 tests
ocaisa Apr 15, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 17 additions & 4 deletions .github/workflows/scripts/test_init_scripts.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,17 +154,30 @@ for shell in ${SHELLS[@]}; do

# Optional test 11, check if the prompt has been updated
if [ "$shell" = "bash" ] || [ "$shell" = "ksh" ] || [ "$shell" = "zsh" ] || [ "$shell" = "sh" ]; then
# Let's configure things to use the EESSI module within the PR
sed 's|export MODULEPATH=.*|export MODULEPATH=init/modules|' init/lmod/sh >init/lmod/sh.test
ln -srf init/lmod/sh.test init/lmod/bash.test
ln -srf init/lmod/sh.test init/lmod/ksh.test
ln -srf init/lmod/sh.test init/lmod/zsh.test
# 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='$ ' ; . init/lmod/$shell 2>/dev/null ; echo \"\$PS1\"")
TEST_EESSI_NO_PS1_UPDATE=$($shell -c "unset PS1 ; . init/lmod/$shell 2>/dev/null ; echo \"\$PS1\"")
TEST_EESSI_PS1_UPDATE=$($shell -c "unset PS1 ; PS1='$ ' ; . init/lmod/$shell.test 2>/dev/null ; echo \"\$PS1\"")
TEST_EESSI_NO_PS1_UPDATE=$($shell -c "unset PS1 ; . init/lmod/$shell.test 2>/dev/null ; echo \"\$PS1\"")
pattern="{EESSI/${EESSI_VERSION}} "
assert_raises 'echo "$TEST_EESSI_PS1_UPDATE" | grep "$pattern"'
assert_raises 'echo "$TEST_EESSI_NO_PS1_UPDATE" | grep "$pattern"' 1
# Also check when we explicitly ask for it not to be updated
TEST_EESSI_EXPLICIT_NO_PS1_UPDATE=$($shell -c "unset PS1 ; PS1='test> ' ; export EESSI_MODULE_UPDATE_PS1=0 ; . init/lmod/$shell 2>/dev/null ; echo \"\$PS1\"")
TEST_EESSI_EXPLICIT_NO_PS1_UPDATE_CALLED_TWICE=$($shell -c "unset PS1 ; PS1='$ ' ; export EESSI_MODULE_UPDATE_PS1=0 ; . init/lmod/$shell 2>/dev/null ; . init/lmod/$shell 2>/dev/null ; echo \"\$PS1\"")
TEST_EESSI_EXPLICIT_NO_PS1_UPDATE=$($shell -c "unset PS1 ; PS1='test> ' ; export EESSI_MODULE_UPDATE_PS1=0 ; . init/lmod/$shell.test 2>/dev/null ; echo \"\$PS1\"")
TEST_EESSI_EXPLICIT_NO_PS1_UPDATE_CALLED_TWICE=$($shell -c "unset PS1 ; PS1='$ ' ; export EESSI_MODULE_UPDATE_PS1=0 ; . init/lmod/$shell.test 2>/dev/null ; . init/lmod/$shell.test 2>/dev/null ; echo \"\$PS1\"")
assert_raises 'echo "$TEST_EESSI_EXPLICIT_NO_PS1_UPDATE" | grep "$pattern"' 1
assert_raises 'echo "$TEST_EESSI_EXPLICIT_NO_PS1_UPDATE_CALLED_TWICE" | grep "$pattern"' 1
# Also check complex prompts, and unloading/purging the EESSI module
prompt="\$(echo '\['✘) $ "
Comment thread
ocaisa marked this conversation as resolved.
promptstr="\[✘ $ "
updated_promptstr="{EESSI/${EESSI_VERSION}} \[✘ $ "
TEST_EESSI_PS1_UPDATE=$($shell -c "unset PS1 ; PS1=\"$prompt\" ; . init/lmod/$shell.test >/dev/null ; echo \"\$PS1\"")
TEST_EESSI_PS1_REVERT=$($shell -c "unset PS1 ; PS1=\"$prompt\" ; . init/lmod/$shell.test >/dev/null ; module purge; echo \"\$PS1\"")
assert 'echo "$TEST_EESSI_PS1_UPDATE"' "$updated_promptstr"
assert 'echo "$TEST_EESSI_PS1_REVERT"' "$promptstr"
fi

# End Test Suite
Expand Down
9 changes: 8 additions & 1 deletion init/modules/EESSI/2023.06.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,7 +222,14 @@ local quiet_load = false
if os.getenv("EESSI_MODULE_UPDATE_PS1") then
local prompt = os.getenv("PS1")
if prompt then
pushenv("PS1", "{EESSI/" .. eessi_version .. "} " .. prompt)
local prefix = "{EESSI/" .. eessi_version .. "} "
if mode() == "load" then
-- Prepend prefix to PS1 without evaluating its contents
execute{cmd="PS1=\"" .. prefix .. "$PS1\"", modeA={"load"}}
elseif mode() == "unload" then
-- Strip the prefix from beginning of PS1
execute{cmd="PS1=\"${PS1#\"" .. prefix .. "\"}\"", modeA={"unload"}}
end
end
end

Expand Down
Loading