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 @@ -168,6 +168,14 @@ if ($?old_rootsys) then
168168 -e " s;^$old_rootsys /etc/notebook:;;g" \
169169 -e " s;^$old_rootsys /etc/notebook${DOLLAR} ;;g" `
170170 endif
171+ # Potential leftovers from ROOT < v6.36
172+ if ($? JUPYTER_CONFIG_DIR) then
173+ setenv JUPYTER_CONFIG_DIR ` set DOLLAR=' $' ; echo $JUPYTER_CONFIG_DIR | \
174+ sed -e " s;:$old_rootsys /etc/notebook:;:;g" \
175+ -e " s;:$old_rootsys /etc/notebook${DOLLAR} ;;g" \
176+ -e " s;^$old_rootsys /etc/notebook:;;g" \
177+ -e " s;^$old_rootsys /etc/notebook${DOLLAR} ;;g" `
178+ endif
171179
172180 if ($? ROOT_INCLUDE_PATH) then
173181 setenv ROOT_INCLUDE_PATH ` set DOLLAR=' $' ; echo $ROOT_INCLUDE_PATH | \
Original file line number Diff line number Diff line change @@ -78,6 +78,11 @@ clean_environment()
7878 drop_from_path " $JUPYTER_CONFIG_PATH " " ${old_rootsys} /etc/notebook"
7979 JUPYTER_CONFIG_PATH=$newpath
8080 fi
81+ # Potential leftovers from ROOT < v6.36
82+ if [ -n " ${JUPYTER_CONFIG_DIR-} " ]; then
83+ drop_from_path " $JUPYTER_CONFIG_DIR " " ${old_rootsys} /etc/notebook"
84+ JUPYTER_CONFIG_DIR=$newpath
85+ fi
8186 fi
8287 if [ -z " ${MANPATH-} " ]; then
8388 # Grab the default man path before setting the path to avoid duplicates
You can’t perform that action at this time.
0 commit comments