From c6ce8eb8f1ddb4e7cb0f6d038ba19884146bf8c4 Mon Sep 17 00:00:00 2001
From: Hugo Slepicka <slepicka@slac.stanford.edu>
Date: Thu, 28 May 2020 11:36:04 -0700
Subject: [PATCH] ENH: Expand PYDM_DISPLAYS_PATH to include screens/pydm
 subfolder of EPICS_ROOT.

---
 scripts/dev_conda | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/scripts/dev_conda b/scripts/dev_conda
index 7b047a9b..38ad5665 100755
--- a/scripts/dev_conda
+++ b/scripts/dev_conda
@@ -11,9 +11,11 @@ conda activate
 # Default to dev pcds release
 conda activate dev
 
+EPICS_ROOT="/reg/g/pcds/epics-dev"
+
 export PYTHONPATH=/reg/g/pcds/pyps/apps/dev/pythonpath
 export PYQTDESIGNERPATH=/reg/g/pcds/pyps/conda/dev_designer_plugins/:$PYQTDESIGNERPATH
 export PYDM_DESIGNER_ONLINE=1
-export PYDM_DISPLAYS_PATH=/reg/g/pcds/epics-dev/
+export PYDM_DISPLAYS_PATH=$EPICS_ROOT/screens/pydm:$EPICS_ROOT
 export LUCID_CONFIG=/reg/g/pcds/pyps/apps/hutch-python/lucid_config/
 export HAPPI_CFG=/reg/g/pcds/pyps/apps/hutch-python/device_config/happi.cfg