wip

src/nixglhost.py

@@ -6,9 +6,10 @@ import json
 import os
 import re
 import shutil
-import subprocess
 import stat
+import subprocess
 import sys
+import tempfile
 import time
 from glob import glob
 from typing import List, Literal, Dict, Tuple, TypedDict, TextIO, Optional
@@ -534,15 +535,21 @@ def nvidia_main(
         cache_content, cache_file_path
     ) or not os.path.isfile(cached_ld_library_path):
         log_info("The cache is not up to date, regenerating it")
-        shutil.rmtree(cache_dir)
-        cache_paths: List[str] = []
-        for p in cache_content.paths:
-            log_info(f"Caching {p}")
-            cache_paths.append(cache_library_path(p, cache_dir))
-        cache_absolute_paths = [os.path.join(cache_dir, p) for p in cache_paths]
-        nix_gl_ld_library_path = generate_cache_metadata(
-            cache_dir, cache_content, cache_absolute_paths
-        )
+        with tempfile.TemporaryDirectory() as tmp_cache:
+            new_cache = os.path.join(tmp_cache, "nix-gl-host")
+            os.makedirs(new_cache)
+            cache_paths: List[str] = []
+            for p in cache_content.paths:
+                log_info(f"Caching {p}")
+                cache_paths.append(cache_library_path(p, tmp_cache))
+            # Pointing the LD_LIBRARY_PATH to the final destination
+            # instead of the tmp dir.
+            cache_absolute_paths = [os.path.join(cache_dir, p) for p in cache_paths]
+            nix_gl_ld_library_path = generate_cache_metadata(
+                cache_dir, cache_content, cache_absolute_paths
+            )
+            log_info(f"Mv {new_cache} to {cache_dir}")
+            shutil.move(new_cache, cache_dir)
     else:
         log_info("The cache is up to date, re-using it.")
         with open(cached_ld_library_path, "r", encoding="utf8") as f: