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

Open
smoors wants to merge 16 commits into
base: main
Choose a base branch
from
Open

fix EESSI prefix for complex prompts #196

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 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
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
8 changes: 8 additions & 0 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 @@ -165,6 +165,14 @@ for shell in ${SHELLS[@]}; do
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\"")
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 '\['✘) $ "
promptstr="\[✘ $ "
updated_promptstr="{EESSI/${EESSI_VERSION}} \[✘ $ "
TEST_EESSI_PS1_UPDATE=$($shell -c "unset PS1 ; PS1=\"$prompt\" ; . init/lmod/$shell >/dev/null 2>&1 ; echo \"\$PS1\"")
TEST_EESSI_PS1_REVERT=$($shell -c "unset PS1 ; PS1=\"$prompt\" ; . init/lmod/$shell >/dev/null 2>&1 ; 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