Merge pull request #39 from LSSTDESC/dev

Bring main up to date

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

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
 

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
@@ -8,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

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