From 2adcbd9cee671b62266dec7f16639a6b039e74c7 Mon Sep 17 00:00:00 2001
From: Johannes Kliemann <kliemann@adacore.com>
Date: Thu, 11 Jun 2026 15:11:37 +0200
Subject: [PATCH] Fix installer call for GNATPro for Rust

---
 lmod_manager/lmod_manager.py                   |  17 ++++++++++++-----
 .../gnatpro-rust-26.2-x86_64-linux-bin.tar.gz  | Bin 0 -> 2504 bytes
 tests/lmod_manager_test.py                     |   7 +++++++
 3 files changed, 19 insertions(+), 5 deletions(-)
 create mode 100644 tests/data/gnatpro-rust-26.2-x86_64-linux-bin.tar.gz

diff --git a/lmod_manager/lmod_manager.py b/lmod_manager/lmod_manager.py
index 9b26849..1ea9daa 100755
--- a/lmod_manager/lmod_manager.py
+++ b/lmod_manager/lmod_manager.py
@@ -276,11 +276,18 @@ def _installation_file() -> Path:
         return Path("bin/rustc")
 
     def _install_archive(self, installation_dir: Path) -> None:
-        call(
-            f"./install --install-dir='{installation_dir}' --force",
-            cwd=self._extracted_archive_dir(),
-            shell=True,
-        )
+        if (self._extracted_archive_dir() / "doinstall").is_file():
+            call(
+                f"./doinstall '{installation_dir}'",
+                cwd=self._extracted_archive_dir(),
+                shell=True,
+            )
+        else:
+            call(
+                f"./install --install-dir='{installation_dir}' --force",
+                cwd=self._extracted_archive_dir(),
+                shell=True,
+            )
 
 
 def main() -> Union[int, str]:
diff --git a/tests/data/gnatpro-rust-26.2-x86_64-linux-bin.tar.gz b/tests/data/gnatpro-rust-26.2-x86_64-linux-bin.tar.gz
new file mode 100644
index 0000000000000000000000000000000000000000..8462d47bd5e98191ff7b32a3824c0d882a3d7efe
GIT binary patch
literal 2504
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
ST#xIoy#515_kwHyC;$L*Ov|VM

literal 0
HcmV?d00001

diff --git a/tests/lmod_manager_test.py b/tests/lmod_manager_test.py
index f05a18f..7ca4ef9 100644
--- a/tests/lmod_manager_test.py
+++ b/tests/lmod_manager_test.py
@@ -247,6 +247,13 @@ def test_install_unexpected_archive_name_format(monkeypatch: MonkeyPatch, tmp_pa
                 "25.0w-20240820",
             ),
         ],
+        [
+            Archive(
+                "gnatpro-rust-26.2-x86_64-linux-bin.tar.gz",
+                "gnatpro-rust",
+                "26.2",
+            ),
+        ],
     ],
 )
 def test_install_and_uninstall(