Merge pull request #141 from nmfs-opensci/eeholmes-patch-1

Update install-conda-packages.sh
nmfs-opensci · Nov 5, 2024 · c0a42fb · c0a42fb
2 parents c95e447 + da4adf9
commit c0a42fb
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/scripts/install-conda-packages.sh b/scripts/install-conda-packages.sh
@@ -17,19 +17,19 @@ if [ -d "${REPO_DIR}/childimage/" ]; then
 
         if test -f "conda-lock.yml"; then
             echo "  Using conda-lock.yml"
-            conda-lock install --name ${CONDA_ENV}
-            pip install --no-deps jupyter-remote-desktop-proxy
+            ${NB_PYTHON_PREFIX}/bin/conda-lock install --name ${CONDA_ENV}
+            ${NB_PYTHON_PREFIX}/bin/pip install --no-deps jupyter-remote-desktop-proxy
             INSTALLATION_HAPPENED=true
         elif test -f "environment.yml"; then
             echo "  Using environment.yml"
-            mamba env update --name ${CONDA_ENV} -f environment.yml
-            pip install --no-deps jupyter-remote-desktop-proxy
+            ${CONDA_DIR}/condabin/mamba env update --name ${CONDA_ENV} -f environment.yml
+            ${NB_PYTHON_PREFIX}/bin/pip install --no-deps jupyter-remote-desktop-proxy
             INSTALLATION_HAPPENED=true
         fi
 
         # Only run cleanup if installation occurred
         if [ "$INSTALLATION_HAPPENED" = true ]; then
-            mamba clean -yaf
+            ${CONDA_DIR}/condabin/mamba clean -yaf
             find ${CONDA_DIR} -follow -type f -name '*.a' -delete
             find ${CONDA_DIR} -follow -type f -name '*.js.map' -delete
             if ls ${NB_PYTHON_PREFIX}/lib/python*/site-packages/bokeh/server/static > /dev/null 2>&1; then