Skip to content

Use flight_HELPER_remove_path to remove slurm from the path #2

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
wants to merge 1 commit into
base: flight-slurm-20.11+flight
Choose a base branch
from
Open

Use flight_HELPER_remove_path to remove slurm from the path #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
18 changes: 7 additions & 11 deletions etc/profile.d/25-slurm.csh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,16 +26,12 @@
#==============================================================================
set path=($path /opt/flight/opt/slurm/bin)

alias flight_slurm_exit 'set newpath=()\
foreach pval ( $path )\
if ($pval != "/opt/flight/opt/slurm/bin") then\
set newpath=($newpath $pval)\
endif\
end\
set path=($newpath)\
unset newpath'
alias | grep "^flight_HELPER_remove_path" >/dev/null
if ( $? == 0 ) then
alias flight_SLURM_exit set 'path=`flight_HELPER_remove_path /opt/flight/opt/slurm/bin`'

if ($?flight_DEFINES) then
setenv flight_DEFINES "${flight_DEFINES} flight_slurm_exit"
setenv flight_DEFINES_exits "flight_slurm_exit ${flight_DEFINES_exits}"
if ($?flight_DEFINES) then
setenv flight_DEFINES "${flight_DEFINES} flight_SLURM_exit"
setenv flight_DEFINES_exits "${flight_DEFINES_exits} flight_SLURM_exit"
endif
endif
14 changes: 8 additions & 6 deletions etc/profile.d/25-slurm.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,13 @@
#==============================================================================
export PATH=$PATH:/opt/flight/opt/slurm/bin

flight_slurm_exit() {
PATH=$(echo "$PATH" | sed 's,:/opt/flight/opt/slurm/bin,,g')
}
if [ "$(type -t flight_HELPER_remove_path)" == "function" ]; then
flight_SLURM_exit() {
PATH=$(flight_HELPER_remove_path /opt/flight/opt/slurm/bin)
}

if [ "${flight_DEFINES}" ]; then
flight_DEFINES+=(flight_slurm_exit)
flight_DEFINES_exits=(flight_slurm_exit "${flight_DEFINES_exits[@]}")
if [ "${flight_DEFINES}" ]; then
flight_DEFINES+=(flight_SLURM_exit)
flight_DEFINES_exits+=(flight_SLURM_exit)
fi
fi