Skip to content

Commit 5c843d0

Browse files
committed
[core] Remove potential leftover paths from future ROOT versions
Remove within thisroot.(c)sh potential leftover paths from future ROOT versions
1 parent d2a42e0 commit 5c843d0

File tree

2 files changed

+13
-0
lines changed

2 files changed

+13
-0
lines changed

config/thisroot.csh

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -161,6 +161,14 @@ if ($?old_rootsys) then
161161
-e "s;^$old_rootsys/etc/notebook:;;g" \
162162
-e "s;^$old_rootsys/etc/notebook${DOLLAR};;g"`
163163
endif
164+
# Potential leftovers from future ROOT > v6.34
165+
if ($?JUPYTER_CONFIG_PATH) then
166+
setenv JUPYTER_CONFIG_PATH `set DOLLAR='$'; echo $JUPYTER_CONFIG_PATH | \
167+
sed -e "s;:$old_rootsys/etc/notebook:;:;g" \
168+
-e "s;:$old_rootsys/etc/notebook${DOLLAR};;g" \
169+
-e "s;^$old_rootsys/etc/notebook:;;g" \
170+
-e "s;^$old_rootsys/etc/notebook${DOLLAR};;g"`
171+
endif
164172

165173
endif
166174

config/thisroot.sh

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,11 @@ clean_environment()
7878
drop_from_path "$JUPYTER_CONFIG_DIR" "${old_rootsys}/etc/notebook"
7979
JUPYTER_CONFIG_DIR=$newpath
8080
fi
81+
# Potential leftovers from future ROOT > v6.34
82+
if [ -n "${JUPYTER_CONFIG_PATH-}" ]; then
83+
drop_from_path "$JUPYTER_CONFIG_PATH" "${old_rootsys}/etc/notebook"
84+
JUPYTER_CONFIG_PATH=$newpath
85+
fi
8186
fi
8287
if [ -z "${MANPATH-}" ]; then
8388
# Grab the default man path before setting the path to avoid duplicates

0 commit comments

Comments
 (0)