From b04031e976125028597f1b8e34df29d0e28e7cd3 Mon Sep 17 00:00:00 2001
From: Heather Kelly <heather999kelly@gmail.com>
Date: Thu, 31 Mar 2022 16:56:42 -0400
Subject: [PATCH 1/5] install which and wget

---
 docker/install-mpich.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docker/install-mpich.sh b/docker/install-mpich.sh
index 579eacb..75a8880 100644
--- a/docker/install-mpich.sh
+++ b/docker/install-mpich.sh
@@ -1,5 +1,7 @@
 #!/bin/bash
 
+yum install -y wget which
+
 source /opt/lsst/software/stack/loadLSST.bash
 
 export mpich=3.3

From 8cd91ef0df8d2e14c7be8ec33a13a7ee41197bd1 Mon Sep 17 00:00:00 2001
From: Heather Kelly <heather999kelly@gmail.com>
Date: Thu, 31 Mar 2022 16:57:42 -0400
Subject: [PATCH 2/5] adding --no-cache-dir to save some space

---
 docker/update-docker.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker/update-docker.sh b/docker/update-docker.sh
index 3708dcb..ecd387e 100644
--- a/docker/update-docker.sh
+++ b/docker/update-docker.sh
@@ -7,7 +7,7 @@ conda install -c conda-forge -y mamba
 mamba install -c conda-forge -y mpich=3.3.*=external_*
 
 mamba install -c conda-forge -y --file ./packlist.txt
-pip install -r ./piplist.txt
+pip install --no-cache-dir -r ./piplist.txt
 
 conda config --set env_prompt "(lsst-scipipe-$1)" --system
 

From b0d15186eaf1ad99d070d5142c59cdf390713e34 Mon Sep 17 00:00:00 2001
From: Heather Kelly <heather999kelly@gmail.com>
Date: Thu, 31 Mar 2022 17:13:34 -0400
Subject: [PATCH 3/5] add #!/bin/bash to setup script

---
 nersc/setup_td_dev.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nersc/setup_td_dev.sh b/nersc/setup_td_dev.sh
index cbc09aa..5da9438 100755
--- a/nersc/setup_td_dev.sh
+++ b/nersc/setup_td_dev.sh
@@ -1,3 +1,4 @@
+#!/bin/bash
 
 # Feb 19 2022: HK Use native install of LSST Sci Pipelines at NERSC
 # Jan 27 2022: HK update to optionally setup LSST Sci Pipelines

From 0794ea0e770166e0598337ab7a8b625da4360ad2 Mon Sep 17 00:00:00 2001
From: Heather Kelly <heather999kelly@gmail.com>
Date: Fri, 1 Apr 2022 08:40:10 -0400
Subject: [PATCH 4/5] drop baseline for zsh compatibility

---
 nersc/setup_td_dev.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nersc/setup_td_dev.sh b/nersc/setup_td_dev.sh
index 5da9438..d172113 100755
--- a/nersc/setup_td_dev.sh
+++ b/nersc/setup_td_dev.sh
@@ -9,7 +9,7 @@
 # Feb 2020: install SNANA on Cori
 #
 
-SCRIPT=`basename ${BASH_SOURCE[0]}`
+SCRIPT=${BASH_SOURCE[0]}
 
 usage() {  # Function: Print a help message.
   echo -e \\n"Help documentation for ${BOLD}${SCRIPT}"\\n

From 312f79cebf5498f72db083ea57b4e6b2e30a4561 Mon Sep 17 00:00:00 2001
From: Heather Kelly <heather999kelly@gmail.com>
Date: Fri, 1 Apr 2022 08:48:10 -0400
Subject: [PATCH 5/5] bash or zsh for now

---
 nersc/setup_td_env.sh | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/nersc/setup_td_env.sh b/nersc/setup_td_env.sh
index ccae285..3015404 100644
--- a/nersc/setup_td_env.sh
+++ b/nersc/setup_td_env.sh
@@ -39,5 +39,12 @@ unset LSST_HOME EUPS_PATH LSST_DEVEL EUPS_PKGROOT REPOSITORY_PATH PYTHONPATH
 export LD_LIBRARY_PATH=$CRAY_MPICH_BASEDIR/mpich-gnu-abi/8.2/lib:$LD_LIBRARY_PATH
 
 export DESC_LSST_INSTALL_DIR=$1
-source $DESC_LSST_INSTALL_DIR/loadLSST.bash
+
+curshell=$(echo $0)
+if [ $curshell = bash ];
+then
+  source $DESC_LSST_INSTALL_DIR/loadLSST.bash
+else
+  source $DESC_LSST_INSTALL_DIR/loadLSST.zsh
+fi
 setup lsst_distrib