Skip to content
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

Squash bug that removes /usr/local/bin from PATH when eicrecon-this.sh is sourced #436

Merged
merged 3 commits into from
Jan 28, 2023
Merged

Squash bug that removes /usr/local/bin from PATH when eicrecon-this.sh is sourced #436

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
186164c
Squash bug that removes /usr/local/bin from PATH when eicrecon-this.s…
faustus123 Jan 13, 2023
dd83da8
Merge branch 'main' into davidl_eicrecon-this-fix
rahmans1 Jan 18, 2023
c98791c
Merge branch 'main' into davidl_eicrecon-this-fix
wdconinc Jan 28, 2023
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
2 changes: 2 additions & 0 deletions src/scripts/eicrecon-this.sh.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,14 @@ export EICrecon_ROOT=$( readlink -f ${SCRIPT_DIR}/.. )

#----------------- JANA2
if [[ -f @JANA_DIR@/../../../bin/jana-this.sh ]] ; then
unset ROOTSYS # prevent ROOT from removing /usr/local/bin from PATH
export JANA_ROOT=$( readlink -f @JANA_DIR@/../../.. )
source @JANA_DIR@/../../../bin/jana-this.sh
fi

#----------------- ROOT
if [[ -f @ROOT_BINDIR@/thisroot.sh ]] ; then
unset ROOTSYS # prevent ROOT from removing /usr/local/bin from PATH
source @ROOT_BINDIR@/thisroot.sh
fi

Expand Down