File tree Expand file tree Collapse file tree 2 files changed +13
-0
lines changed
Expand file tree Collapse file tree 2 files changed +13
-0
lines changed Original file line number Diff line number Diff line change @@ -125,6 +125,14 @@ if ($?old_rootsys) then
125125 -e " s;^$old_rootsys /etc/notebook:;;g" \
126126 -e " s;^$old_rootsys /etc/notebook${DOLLAR} ;;g" `
127127 endif
128+ # Potential leftovers from future ROOT > v6.34
129+ if ($? JUPYTER_CONFIG_PATH) then
130+ setenv JUPYTER_CONFIG_PATH ` set DOLLAR=' $' ; echo $JUPYTER_CONFIG_PATH | \
131+ sed -e " s;:$old_rootsys /etc/notebook:;:;g" \
132+ -e " s;:$old_rootsys /etc/notebook${DOLLAR} ;;g" \
133+ -e " s;^$old_rootsys /etc/notebook:;;g" \
134+ -e " s;^$old_rootsys /etc/notebook${DOLLAR} ;;g" `
135+ endif
128136
129137endif
130138
Original file line number Diff line number Diff line change @@ -73,6 +73,11 @@ clean_environment()
7373 drop_from_path " $JUPYTER_CONFIG_DIR " " ${old_rootsys} /etc/notebook"
7474 JUPYTER_CONFIG_DIR=$newpath
7575 fi
76+ # Potential leftovers from future ROOT > v6.34
77+ if [ -n " ${JUPYTER_CONFIG_PATH-} " ]; then
78+ drop_from_path " $JUPYTER_CONFIG_PATH " " ${old_rootsys} /etc/notebook"
79+ JUPYTER_CONFIG_PATH=$newpath
80+ fi
7681 fi
7782 if [ -z " ${MANPATH-} " ]; then
7883 # Grab the default man path before setting the path to avoid duplicates
You can’t perform that action at this time.
0 commit comments