From f968689aad1385de2e0d95f1ee1a1b94db093129 Mon Sep 17 00:00:00 2001
From: Julien Jerphanion <git@jjerphan.xyz>
Date: Tue, 25 Feb 2025 11:13:40 +0100
Subject: [PATCH] maint: Adapt mamba activation

Signed-off-by: Julien Jerphanion <git@jjerphan.xyz>
---
 .../buildpacks/conda/activate-conda.sh        | 29 ++++++++++++++-----
 1 file changed, 21 insertions(+), 8 deletions(-)

diff --git a/repo2docker/buildpacks/conda/activate-conda.sh b/repo2docker/buildpacks/conda/activate-conda.sh
index b5a54e30..d3732c8f 100755
--- a/repo2docker/buildpacks/conda/activate-conda.sh
+++ b/repo2docker/buildpacks/conda/activate-conda.sh
@@ -1,11 +1,24 @@
-# enable conda and activate the notebook environment
-set -e
+set -ex
+
+# Setup conda
+CONDA_PROFILE="${CONDA_DIR}/etc/profile.d/conda.sh"
+echo "Activating profile: ${CONDA_PROFILE}"
+test -f $CONDA_PROFILE && . $CONDA_PROFILE
+
+# Setup micromamba
 eval $(micromamba shell hook -s posix -r ${CONDA_DIR})
-for name in conda mamba; do
-    CONDA_PROFILE="${CONDA_DIR}/etc/profile.d/${name}.sh"
-    echo "Activating profile: ${CONDA_PROFILE}"
-    test -f $CONDA_PROFILE && . $CONDA_PROFILE
-done
+
+# Setup mamba
+export MAMBA_ROOT_PREFIX="${CONDA_DIR}"
+__mamba_setup="$("${CONDA_DIR}/bin/mamba" shell hook --shell posix 2> /dev/null)"
+if [ $? -eq 0 ]; then
+    eval "$__mamba_setup"
+else
+    alias mamba="${CONDA_DIR}/bin/mamba"  # Fallback on help from mamba activate
+fi
+unset __mamba_setup
+
+# Activate the environment
 if [[ "${KERNEL_PYTHON_PREFIX}" != "${NB_PYTHON_PREFIX}" ]]; then
     # if the kernel is a separate env, stack them
     # so both are on PATH, notebook first
@@ -22,4 +35,4 @@ else
     mamba activate ${NB_PYTHON_PREFIX}
 fi
 
-set +e
+set +ex