adjust setting of conda_exe_name and unify over installer types

Author: lrandersson

constructor/header.sh

@@ -496,7 +496,7 @@ CONDA_EXEC="$PREFIX/{{ conda_exe_name }}"
 extract_range "${boundary0}" "${boundary1}" > "$CONDA_EXEC"
 chmod +x "$CONDA_EXEC"
 
-{%- if conda_exe_name != "_conda" or conda_exe_name != "conda.exe" %}
+{%- if conda_exe_name != "_conda" %}
 # In case there are packages that depend on _conda
 ln -s "$CONDA_EXEC" "$PREFIX"/_conda
 {%- endif %}

constructor/osx/prepare_installation.sh

@@ -30,7 +30,7 @@ unset MAMBARC
 
 chmod +x "$CONDA_EXEC"
 
-{%- if conda_exe_name != "_conda" or conda_exe_name != "conda.exe" %}
+{%- if conda_exe_name != "_conda" %}
 # In case there are packages that depend on _conda
 ln -s "$CONDA_EXEC" "$PREFIX"/_conda
 {%- endif %}

constructor/osxpkg.py

@@ -25,6 +25,7 @@
     approx_size_kb,
     copy_conda_exe,
     explained_check_call,
+    format_conda_exe_name,
     get_final_channels,
     parse_virtual_specs,
     rm_rf,
@@ -364,7 +365,7 @@ def move_script(src, dst, info, ensure_shebang=False, user_script_type=None):
     variables["no_rcs_arg"] = info.get("_ignore_condarcs_arg", "")
     variables["script_env_variables"] = info.get("script_env_variables", {})
     variables["initialize_conda"] = info.get("initialize_conda", "classic")
-    variables["conda_exe_name"] = Path(info["_conda_exe"]).name
+    variables["conda_exe_name"] = format_conda_exe_name(info["_conda_exe"])
 
     data = render_template(data, **variables)
 

constructor/shar.py

@@ -19,7 +19,6 @@
 from contextlib import nullcontext
 from io import BytesIO
 from os.path import basename, dirname, getsize, isdir, join, relpath
-from pathlib import Path
 
 from .construct import ns_platform
 from .jinja import render_template
@@ -31,6 +30,7 @@
     approx_size_kb,
     copy_conda_exe,
     filename_dist,
+    format_conda_exe_name,
     get_final_channels,
     hash_files,
     parse_virtual_specs,
@@ -111,7 +111,7 @@ def get_header(conda_exec, tarball, info):
     virtual_specs = parse_virtual_specs(info)
     min_osx_version = virtual_specs.get("__osx", {}).get("min") or ""
     variables["min_osx_version"] = min_osx_version
-    variables["conda_exe_name"] = Path(info["_conda_exe"]).name
+    variables["conda_exe_name"] = format_conda_exe_name(info["_conda_exe"])
     min_glibc_version = virtual_specs.get("__glibc", {}).get("min") or ""
     variables["min_glibc_version"] = min_glibc_version
 

constructor/utils.py

@@ -344,6 +344,31 @@ def identify_conda_exe(conda_exe: str | Path | None = None) -> tuple[StandaloneE
     return None, None
 
 
+def format_conda_exe_name(conda_exe: str | Path) -> str:
+    """Return a formatted alias for given stand-alone executable.
+
+      - If given executable cannot be identified, returns the basename of given executable.
+      - If stand-alone conda is identified, returns '_conda'.
+      - If stand-alone mamba/micromamba is identified, returns 'micromamba'.
+
+    Parameters::
+      - conda_exe: str | Path
+      Path to the conda executable to be accounted for.
+    """
+    conda_exe_name, _ = identify_conda_exe(conda_exe)
+    if conda_exe_name is None:
+        # This implies that identify_conda_exe failed
+        return Path(conda_exe).name
+    if conda_exe_name == StandaloneExe.CONDA:
+        return "_conda"
+    elif conda_exe_name == StandaloneExe.MAMBA:
+        return "micromamba"
+    else:
+        # This should never happen, but as a safe-guard in case `identify_conda_exe` is changed without
+        # accounting for this function.
+        raise RuntimeError("Unable to format conda exe name")
+
+
 def check_version(
     exe_version: str | VersionOrder | None = None,
     min_version: str | None = None,

tests/test_examples.py

@@ -21,7 +21,12 @@
 from conda.models.version import VersionOrder as Version
 from ruamel.yaml import YAML
 
-from constructor.utils import StandaloneExe, check_version, identify_conda_exe
+from constructor.utils import (
+    StandaloneExe,
+    check_version,
+    format_conda_exe_name,
+    identify_conda_exe,
+)
 
 if TYPE_CHECKING:
     from collections.abc import Generator, Iterable
@@ -663,7 +668,7 @@ def test_macos_signing(tmp_path, self_signed_application_certificate_macos):
     # including binary archives like the PlugIns file
     cmd = ["pkgutil", "--expand-full", installer, expanded_path]
     _execute(cmd)
-    conda_exe_name = "micromamba" if _is_micromamba(CONSTRUCTOR_CONDA_EXE) else "conda.exe"
+    conda_exe_name = format_conda_exe_name(CONSTRUCTOR_CONDA_EXE)
     components = [
         Path(expanded_path, "prepare_installation.pkg", "Payload", "osx-pkg-test", conda_exe_name),
         Path(expanded_path, "Plugins", "ExtraPage.bundle"),