goget cleanup fix

Author: pirate

abx_pkg/binprovider_goget.py

@@ -2,6 +2,7 @@
 __package__ = "abx_pkg"
 
 import os
+import shutil
 
 from pathlib import Path
 
@@ -169,11 +170,25 @@ def default_uninstall_handler(
         min_version: SemVer | None = None,
         timeout: int | None = None,
     ) -> bool:
-        abspath = self.get_abspath(bin_name, quiet=True, no_cache=True)
-        if not abspath:
-            return True
+        install_args = list(install_args or self.get_install_args(bin_name))
+        install_target = install_args[0] if install_args else bin_name
+        candidate_name = (
+            Path(str(install_target).split("@", 1)[0].rstrip("/")).name or bin_name
+        )
+
+        bin_dir = self.bin_dir
+        assert bin_dir is not None
+        paths_to_remove: list[Path] = []
+        requested_path = bin_dir / bin_name
+        paths_to_remove.append(requested_path)
+        if candidate_name != bin_name:
+            paths_to_remove.append(bin_dir / candidate_name)
 
-        Path(abspath).unlink(missing_ok=True)
+        for path in paths_to_remove:
+            if path.is_dir():
+                shutil.rmtree(path, ignore_errors=True)
+            else:
+                path.unlink(missing_ok=True)
         return True
 
     def default_abspath_handler(

tests/conftest.py

@@ -140,7 +140,7 @@ def assert_shallow_binary_loaded(
             expected_abspath = provider.bin_dir / loaded.name
             assert expected_abspath.exists()
             assert expected_abspath == loaded.loaded_abspath
-            assert expected_abspath.parent == provider.bin_dir
+            assert expected_abspath.is_relative_to(provider.bin_dir)
 
         if expected_version is not None:
             assert loaded.loaded_version >= expected_version