@@ -47,34 +47,23 @@ python3.8 instance-monitor.py &
4747# 5. UPDATE AND/OR INSTALL PLUGINS
4848if [[ ${USE_PLUGINS} == ' True' ]]; then
4949 if [[ ${UPDATE_PLUGINS} == ' True' ]]; then
50- echo " Updating CellProfiler-plugins."
51- cd CellProfiler-plugins
52- git fetch --all
53- git pull
54- cd ..
50+ (echo " Updating CellProfiler-plugins." & cd CellProfiler-plugins && git fetch --all && git pull && cd ..)
5551 fi
5652 if [[ -z " $PLUGINS_COMMIT " ]]; then
5753 PLUGINS_COMMIT=' False'
5854 fi
5955 if [[ ${PLUGINS_COMMIT} != ' False' ]]; then
60- echo " Checking out specific CellProfiler-plugins commit."
61- cd CellProfiler-plugins
62- git checkout ${PLUGINS_COMMIT} || echo " No such commit, branch, or version; failing here." & exit 1
63- cd ..
56+ (echo " Checking out specific CellProfiler-plugins commit." & cd CellProfiler-plugins && git checkout ${PLUGINS_COMMIT} && cd .. && echo " checkout successful" && sleep 3) || (echo " No such commit, branch, or version; failing here." & exit 1)
6457 fi
6558 if [[ ${INSTALL_REQUIREMENTS} == ' True' ]]; then
6659 cd CellProfiler-plugins
6760 if [[ -z " $REQUIREMENTS " ]]; then
6861 REQUIREMENTS = $REQUIREMENTS_FILE
6962 fi
7063 if [[ -d " active_plugins" ]]; then
71- echo " Installing CellProfiler-plugins requirements."
72- pip install -e . ${REQUIREMENTS} || echo " Requirements install failed." & exit 1
73- cd ..
64+ (echo " Installing CellProfiler-plugins requirements." & pip install -e . ${REQUIREMENTS} && cd ..) || (echo " Requirements install failed." & exit 1)
7465 else
75- echo " Detected deprecated CellProfiler-plugins repo organization. Installing requirements."
76- pip install -r ${REQUIREMENTS} || echo " Requirements file not present or install failed; failing here." & exit 1
77- cd ..
66+ (echo " Detected deprecated CellProfiler-plugins repo organization. Installing requirements." & pip install -r ${REQUIREMENTS} && cd ..) || (echo " Requirements file not present or install failed; failing here." & exit 1)
7867 fi
7968 fi
8069fi
0 commit comments