Skip to content

Add condition and test for explicit set of no PS1 #192

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 6 commits into from
Mar 25, 2026
Merged

Add condition and test for explicit set of no PS1 #192

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
305b37d
Add condition and test for explicit set of no PS1
adammccartney Mar 25, 2026
591e966
Merge branch 'main' into configure_eessi_module_update_ps1
ocaisa Mar 25, 2026
329e317
Tweak tests and remove unneeded code
ocaisa Mar 25, 2026
0ea3ee9
Move PS1 into block where EESSI_MODULE_UPDATE_PS1 is exported
adammccartney Mar 25, 2026
0432805
Update comment
adammccartney Mar 25, 2026
b6aa04e
Apply suggestion from @ocaisa
ocaisa Mar 25, 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
3 changes: 3 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 @@ -150,6 +150,9 @@ for shell in ${SHELLS[@]}; do
pattern="{EESSI/${EESSI_VERSION}} "
assert_raises 'echo "$TEST_EESSI_PS1_UPDATE" | grep "$pattern"'
assert_raises 'echo "$TEST_EESSI_NO_PS1_UPDATE" | grep "$pattern"' 1
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\"")
pattern='test> '
assert_raises 'echo "$TEST_EESSI_EXPLICIT_NO_PS1_UPDATE" | grep "$pattern"' 1
Comment thread
ocaisa marked this conversation as resolved.
fi

# End Test Suite
Expand Down
7 changes: 6 additions & 1 deletion init/lmod/sh
View file
Open in desktop
Comment thread
adammccartney marked this conversation as resolved.
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,12 @@ if [ -z "$__Init_EESSI_Default_Modules" ]; then
# (in an interactive shell PS1 is likely unset, so let's only do this if it is set)
if [ -n "$PS1" ]; then
export PS1
Comment thread
adammccartney marked this conversation as resolved.
Outdated
export EESSI_MODULE_UPDATE_PS1=1
if [ -n "${__Init_EESSI_MODULE_UPDATE_PS1+x}" ] || [ $((EESSI_MODULE_UPDATE_PS1)) -eq 0 ]; then
export __Init_EESSI_MODULE_UPDATE_PS1=0
unset EESSI_MODULE_UPDATE_PS1
Comment thread
ocaisa marked this conversation as resolved.
else
export EESSI_MODULE_UPDATE_PS1=1
fi
Comment thread
ocaisa marked this conversation as resolved.
Outdated
fi

# Figure out which shell was used to source this script, which we then use to source the corresponding
Expand Down
Loading