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

Small fix to pushd and popd around source thisroot.sh #272

Merged
merged 1 commit into from
Jan 31, 2024
Merged

Small fix to pushd and popd around source thisroot.sh #272

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
6 changes: 5 additions & 1 deletion scripts/jana-this.sh.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,11 @@ export PATH=@JANA_INSTALL_DIR@/bin:${PATH}
if [ "@JANA2_HAVE_ROOT@" == "1" ]; then
if [ -f "@ROOTSYS@/bin/thisroot.sh" ]; then
unset ROOTSYS
. "@ROOTSYS@/bin/thisroot.sh"
# workaround for https://github.com/root-project/root/issues/14085
# thisroot.sh does not recognize bash when running in qemu (like eic-shell on Silicon)
pushd @ROOT_BINDIR@ >/dev/null
source thisroot.sh
popd >/dev/null
fi
fi

Expand Down
Loading