Fix Linux provider bootstrap paths

Signed-off-by: Nick Sweeting <git@sweeting.me>

Author: pirate

abxpkg/binprovider_brew.py

@@ -307,9 +307,27 @@ def default_install_handler(
             ],
             timeout=timeout,
         )
+        proc_output = format_subprocess_output(proc.stdout, proc.stderr)
+        if (
+            proc.returncode != 0
+            and "The `brew link` step did not complete successfully" in proc_output
+        ):
+            for package in dict.fromkeys(
+                arg
+                for arg in install_args
+                if isinstance(arg, str) and not arg.startswith("-")
+            ):
+                link_proc = self.exec(
+                    bin_name=installer_bin,
+                    cmd=["link", "--overwrite", package],
+                    timeout=timeout,
+                )
+                if link_proc.returncode != 0:
+                    self._raise_proc_error("install", install_args, link_proc)
+            return proc_output
         if proc.returncode != 0:
             self._raise_proc_error("install", install_args, proc)
-        return format_subprocess_output(proc.stdout, proc.stderr)
+        return proc_output
 
     @remap_kwargs({"packages": "install_args"})
     def default_update_handler(

abxpkg/binprovider_cargo.py

@@ -6,7 +6,7 @@
 from pathlib import Path
 
 from pydantic import Field, model_validator, computed_field
-from typing import Self
+from typing import Self, cast
 
 from .base_types import (
     BinProviderName,
@@ -16,11 +16,12 @@
     abxpkg_install_root_default,
 )
 from .semver import SemVer
-from .binprovider import BinProvider, log_method_call, remap_kwargs
+from .binprovider import BinProvider, EnvProvider, log_method_call, remap_kwargs
 from .logging import format_subprocess_output
 
 
 DEFAULT_CARGO_HOME = Path(os.environ.get("CARGO_HOME", "~/.cargo")).expanduser()
+MIN_CARGO_INSTALLER_VERSION = cast(SemVer, SemVer.parse("1.85.0"))
 
 
 class CargoProvider(BinProvider):
@@ -77,6 +78,64 @@ def setup_PATH(self, no_cache: bool = False) -> None:
         self.PATH = self._merge_PATH(*cargo_bin_dirs, PATH=self.PATH, prepend=True)
         super().setup_PATH(no_cache=no_cache)
 
+    def INSTALLER_BINARY(self, no_cache: bool = False):
+        from . import Binary, DEFAULT_PROVIDER_NAMES, PROVIDER_CLASS_BY_NAME
+
+        cached_installer = self._INSTALLER_BINARY
+        if not no_cache and cached_installer and cached_installer.is_valid:
+            cached_version = cached_installer.loaded_version
+            if (
+                cached_version is not None
+                and cached_version >= MIN_CARGO_INSTALLER_VERSION
+            ):
+                return cached_installer
+
+        loaded = None
+        try:
+            loaded = super().INSTALLER_BINARY(no_cache=no_cache)
+        except Exception:
+            loaded = None
+
+        if loaded and loaded.loaded_abspath:
+            loaded_version = loaded.loaded_version
+            if (
+                loaded_version is not None
+                and loaded_version >= MIN_CARGO_INSTALLER_VERSION
+            ):
+                self._INSTALLER_BINARY = loaded
+                return loaded
+
+        raw_provider_names = os.environ.get("ABXPKG_BINPROVIDERS")
+        selected_provider_names = (
+            [provider_name.strip() for provider_name in raw_provider_names.split(",")]
+            if raw_provider_names
+            else list(DEFAULT_PROVIDER_NAMES)
+        )
+        env_provider = EnvProvider(install_root=None, bin_dir=None)
+        installer_providers: list[BinProvider] = [
+            env_provider
+            if provider_name == "env"
+            else PROVIDER_CLASS_BY_NAME[provider_name]()
+            for provider_name in selected_provider_names
+            if provider_name
+            and provider_name in PROVIDER_CLASS_BY_NAME
+            and provider_name != self.name
+        ]
+        if not installer_providers:
+            installer_providers = [env_provider]
+
+        upgraded = Binary(
+            name=self.INSTALLER_BIN,
+            min_version=MIN_CARGO_INSTALLER_VERSION,
+            binproviders=installer_providers,
+        ).install(no_cache=no_cache)
+        if upgraded and upgraded.loaded_abspath:
+            self._INSTALLER_BINARY = upgraded
+            return upgraded
+
+        assert loaded is not None
+        return loaded
+
     @log_method_call()
     def setup(
         self,

abxpkg/binprovider_nix.py

@@ -220,6 +220,20 @@ def default_install_handler(
         install_args = install_args or self.get_install_args(bin_name)
         installer_bin = self.INSTALLER_BINARY(no_cache=no_cache).loaded_abspath
         assert installer_bin
+        env = {
+            key: value
+            for key, value in os.environ.items()
+            if key not in {"GH_TOKEN", "GITHUB_TOKEN"}
+        }
+        nix_config = env.get("NIX_CONFIG", "").rstrip()
+        env["NIX_CONFIG"] = "\n".join(
+            line
+            for line in (
+                nix_config,
+                "access-tokens = github.com=",
+            )
+            if line
+        )
 
         proc = self.exec(
             bin_name=installer_bin,
@@ -234,6 +248,7 @@ def default_install_handler(
                 str(self.install_root),
                 *install_args,
             ],
+            env=env,
             timeout=timeout,
         )
         if proc.returncode != 0:
@@ -258,6 +273,20 @@ def default_update_handler(
         )
         installer_bin = self.INSTALLER_BINARY(no_cache=no_cache).loaded_abspath
         assert installer_bin
+        env = {
+            key: value
+            for key, value in os.environ.items()
+            if key not in {"GH_TOKEN", "GITHUB_TOKEN"}
+        }
+        nix_config = env.get("NIX_CONFIG", "").rstrip()
+        env["NIX_CONFIG"] = "\n".join(
+            line
+            for line in (
+                nix_config,
+                "access-tokens = github.com=",
+            )
+            if line
+        )
 
         proc = self.exec(
             bin_name=installer_bin,
@@ -272,6 +301,7 @@ def default_update_handler(
                 str(self.install_root),
                 profile_element,
             ],
+            env=env,
             timeout=timeout,
         )
         if proc.returncode != 0:
@@ -296,6 +326,20 @@ def default_uninstall_handler(
         )
         installer_bin = self.INSTALLER_BINARY(no_cache=no_cache).loaded_abspath
         assert installer_bin
+        env = {
+            key: value
+            for key, value in os.environ.items()
+            if key not in {"GH_TOKEN", "GITHUB_TOKEN"}
+        }
+        nix_config = env.get("NIX_CONFIG", "").rstrip()
+        env["NIX_CONFIG"] = "\n".join(
+            line
+            for line in (
+                nix_config,
+                "access-tokens = github.com=",
+            )
+            if line
+        )
 
         proc = self.exec(
             bin_name=installer_bin,
@@ -310,6 +354,7 @@ def default_uninstall_handler(
                 str(self.install_root),
                 profile_element,
             ],
+            env=env,
             timeout=timeout,
         )
         if proc.returncode not in (0, 1):

tests/conftest.py

@@ -93,7 +93,6 @@ def require_tool(self, tool_name: str) -> str:
                     str(_abxpkg_executable()),
                     "--lib=None",
                     "install",
-                    "--abspath",
                     tool_name,
                 ],
                 capture_output=True,
@@ -104,10 +103,7 @@ def require_tool(self, tool_name: str) -> str:
                     "TERM": "dumb",
                 },
             )
-            output_lines = [
-                line.strip() for line in proc.stdout.splitlines() if line.strip()
-            ]
-            tool_path = output_lines[-1] if output_lines else shutil.which(tool_name)
+            tool_path = shutil.which(tool_name)
             assert proc.returncode == 0 and tool_path, (
                 f"{tool_name} is required on this host for test-machine integration tests, "
                 f"and fallback install via abxpkg failed.\n"