release: abxpkg 1.11.183

Author: pirate

abxpkg/binprovider_pnpm.py

@@ -4,6 +4,7 @@
 
 import json
 import os
+import shlex
 import sys
 import tempfile
 import urllib.parse
@@ -485,22 +486,25 @@ def _refresh_bin_link(
         bin_name: BinName | HostBinPath,
         target: HostBinPath,
     ) -> HostBinPath:
-        """Recreate the managed shim symlink pointing at the resolved pnpm executable."""
+        """Recreate the managed shim wrapper pointing at the resolved pnpm executable."""
         link_path = self._linked_bin_path(bin_name)
         assert link_path is not None, "_refresh_bin_link requires bin_dir to be set"
         link_path.parent.mkdir(parents=True, exist_ok=True)
-        # Idempotent refresh: skip when shim already points at target.
+        target_path = Path(target).expanduser().resolve(strict=False)
+        wrapper = f'#!/bin/sh\nexec {shlex.quote(str(target_path))} "$@"\n'
+        # Idempotent refresh: skip when shim already runs the target.
         # Rewriting on every load() bumps mtime and churns the inode,
         # which invalidates fingerprint caches unnecessarily.
-        if link_path.is_symlink():
+        if link_path.is_file() and not link_path.is_symlink():
             try:
-                if link_path.readlink() == Path(target):
+                if link_path.read_text() == wrapper:
                     return TypeAdapter(HostBinPath).validate_python(link_path)
             except OSError:
                 pass
         if link_path.exists() or link_path.is_symlink():
             link_path.unlink(missing_ok=True)
-        link_path.symlink_to(target)
+        link_path.write_text(wrapper)
+        link_path.chmod(0o755)
         return TypeAdapter(HostBinPath).validate_python(link_path)
 
     def default_search_handler(

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "abxpkg"
-version = "1.11.182"
+version = "1.11.183"
 description = "System package manager interfaces with Python type hints"
 authors = [{name = "Nick Sweeting"}, {name = "ArchiveBox"}]
 requires-python = ">=3.12,<3.15"

tests/test_pnpmprovider.py

@@ -1,6 +1,7 @@
 import logging
 import os
 import shutil
+import subprocess
 import tempfile
 from pathlib import Path
 
@@ -11,6 +12,33 @@
 
 
 class TestPnpmProvider:
+    def test_refresh_bin_link_preserves_pnpm_shim_basedir_behavior(self):
+        with tempfile.TemporaryDirectory() as temp_dir:
+            temp_path = Path(temp_dir)
+            package_bin_dir = temp_path / "package" / "node_modules" / ".bin"
+            exposed_bin_dir = temp_path / "bin"
+            target = package_bin_dir / "demo"
+            package_bin_dir.mkdir(parents=True)
+            target.write_text('#!/bin/sh\ncat "$(dirname "$0")/payload.txt"\n')
+            target.chmod(0o755)
+            (package_bin_dir / "payload.txt").write_text("ok")
+
+            provider = PnpmProvider(
+                install_root=temp_path / "pnpm",
+                bin_dir=exposed_bin_dir,
+                postinstall_scripts=True,
+                min_release_age=0,
+            )
+
+            exposed = provider._refresh_bin_link("demo", target)
+            result = subprocess.run(
+                [str(exposed)],
+                check=True,
+                capture_output=True,
+                text=True,
+            )
+            assert result.stdout == "ok"
+
     def test_self_bootstrap_installs_pnpm_when_host_pnpm_is_not_on_path(
         self,
         test_machine,