From 7ddecd6198403e1889d4bd6053dd277ff77a8cfe Mon Sep 17 00:00:00 2001 From: Eli Holmes - NOAA Date: Wed, 13 Nov 2024 16:12:13 -0800 Subject: [PATCH] Update install-conda-packages.sh --- scripts/install-conda-packages.sh | 51 ++++++++++++++++++++++--------- 1 file changed, 37 insertions(+), 14 deletions(-) diff --git a/scripts/install-conda-packages.sh b/scripts/install-conda-packages.sh index 937420f..5c74100 100644 --- a/scripts/install-conda-packages.sh +++ b/scripts/install-conda-packages.sh @@ -29,21 +29,43 @@ fi echo " Found file: $ENV_FILE" -# Determine file type based on content -if grep -q "lock_set" "$ENV_FILE"; then - echo " Detected conda-lock.yml file." - ${NB_PYTHON_PREFIX}/bin/conda-lock install --name ${CONDA_ENV} -f "$ENV_FILE" - INSTALLATION_HAPPENED=true -elif grep -q "name:" "$ENV_FILE"; then - echo " Detected environment.yml file." - ${CONDA_DIR}/condabin/mamba env update --name ${CONDA_ENV} -f "$ENV_FILE" - INSTALLATION_HAPPENED=true +# Check if the Conda environment exists +if ! ${CONDA_DIR}/condabin/conda env list | grep -q "^${CONDA_ENV} "; then + echo " Environment '${CONDA_ENV}' not found. Creating it." + + # Create environment if conda-lock.yml file is provided + if grep -q "lock_set" "$ENV_FILE"; then + echo " Detected conda-lock.yml file." + ${NB_PYTHON_PREFIX}/bin/conda-lock install --name ${CONDA_ENV} -f "$ENV_FILE" + INSTALLATION_HAPPENED=true + elif grep -q "name:" "$ENV_FILE"; then + echo " Detected environment.yml file." + ${CONDA_DIR}/condabin/mamba env create -f "$ENV_FILE" + INSTALLATION_HAPPENED=true + else + echo "Error: Unrecognized file format in '${ENV_FILE}'." + echo " - For an environment.yml file, ensure it includes a 'name:' entry. Any name is acceptable." + echo " - For a conda-lock.yml file, ensure it includes a 'lock_set:' entry." + exit 1 + fi else - # If neither condition matches, output a helpful error message - echo "Error: Unrecognized file format in '${env_file}'." - echo " - For an environment.yml file, ensure it includes a 'name:' entry. Any name is acceptable." - echo " - For a conda-lock.yml file, ensure it includes a 'lock_set:' entry." - exit 1 + echo " Environment '${CONDA_ENV}' exists. Updating it." + + # Update environment if conda-lock.yml or environment.yml file is provided + if grep -q "lock_set" "$ENV_FILE"; then + echo " Detected conda-lock.yml file." + ${NB_PYTHON_PREFIX}/bin/conda-lock install --name ${CONDA_ENV} -f "$ENV_FILE" + INSTALLATION_HAPPENED=true + elif grep -q "name:" "$ENV_FILE"; then + echo " Detected environment.yml file." + ${CONDA_DIR}/condabin/mamba env update --name ${CONDA_ENV} -f "$ENV_FILE" + INSTALLATION_HAPPENED=true + else + echo "Error: Unrecognized file format in '${ENV_FILE}'." + echo " - For an environment.yml file, ensure it includes a 'name:' entry. Any name is acceptable." + echo " - For a conda-lock.yml file, ensure it includes a 'lock_set:' entry." + exit 1 + fi fi # Run cleanup if installation occurred @@ -57,3 +79,4 @@ if [ "$INSTALLATION_HAPPENED" = true ]; then fi echo " Success! install-conda-packages.sh" +