Skip to content

[6.32][thisroot] prevent leftover paths from future ROOT versions #20654

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
guitargeek merged 2 commits into from
Dec 8, 2025
+13 −0
Merged

[6.32][thisroot] prevent leftover paths from future ROOT versions #20654

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4101772
[thisroot] prevent leftovers from future ROOT versions
ferdymercury Dec 5, 2025
0b0c5dc
[csh] prevent leftover paths from future versions
ferdymercury Dec 5, 2025
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 config/thisroot.csh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,14 @@ if ($?old_rootsys) then
-e "s;^$old_rootsys/etc/notebook:;;g" \
-e "s;^$old_rootsys/etc/notebook${DOLLAR};;g"`
endif
# Potential leftovers from future ROOT > v6.34
if ($?JUPYTER_CONFIG_PATH) then
setenv JUPYTER_CONFIG_PATH `set DOLLAR='$'; echo $JUPYTER_CONFIG_PATH | \
sed -e "s;:$old_rootsys/etc/notebook:;:;g" \
-e "s;:$old_rootsys/etc/notebook${DOLLAR};;g" \
-e "s;^$old_rootsys/etc/notebook:;;g" \
-e "s;^$old_rootsys/etc/notebook${DOLLAR};;g"`
endif

endif

Expand Down
5 changes: 5 additions & 0 deletions config/thisroot.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,11 @@ clean_environment()
drop_from_path "$JUPYTER_CONFIG_DIR" "${old_rootsys}/etc/notebook"
JUPYTER_CONFIG_DIR=$newpath
fi
# Potential leftovers from future ROOT > v6.34
if [ -n "${JUPYTER_CONFIG_PATH-}" ]; then
drop_from_path "$JUPYTER_CONFIG_PATH" "${old_rootsys}/etc/notebook"
JUPYTER_CONFIG_PATH=$newpath
fi
fi
if [ -z "${MANPATH-}" ]; then
# Grab the default man path before setting the path to avoid duplicates
Expand Down
Loading