Merge pull request #138 from ZLLentz/maint_conda_base

MAINT: cleaner handling of latest conda and dev conda
pcdshub · Nov 9, 2022 · 3adc5bf · 3adc5bf
2 parents 649a32f + 6172f36
commit 3adc5bf
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/scripts/dev_conda b/scripts/dev_conda
@@ -28,8 +28,8 @@ source "${BASE_ENV}/etc/profile.d/conda.sh"
 
 # Activate base env first so things like conda build are available
 conda activate
-# Default to dev pcds release
-conda activate dev
+# Default to latest pcds release as the base
+conda activate "$(cat "${BASE_ENV}/latest_env")"
 
 PCDSDEVICES_DEV_UI="${APPS_ROOT}/dev/pcdsdevices/pcdsdevices/ui"
 

diff --git a/scripts/pcds_conda b/scripts/pcds_conda
@@ -65,9 +65,7 @@ if [[ -z "${PCDS_CONDA_VER}" ]]; then
   # If env var unset, then default to latest
   BASE_ENV="${CONDA_ROOT}/py39"
   PYTHON_VER="3.9"
-  PCDS_CONDA_VER="$(command ls "${BASE_ENV}/envs" | command grep pcds- | command tail -1)"
-  SERIES="pcds"
-  VER_NUM="$(echo "${PCDS_CONDA_VER}" | cut -d - -f 2)"
+  PCDS_CONDA_VER="$(cat "${BASE_ENV}/latest_env")"
 else
   # Figure out which base to use
   if [[ -z "${PCDS_CONDA_VER##*-*}" ]]; then