From 5d566d6debe16fc1a7d77145ec0914d4d03c3b6b Mon Sep 17 00:00:00 2001
From: Leo Vasanko <git@vasanko.com>
Date: Sat, 2 May 2026 05:47:24 +0000
Subject: [PATCH] Restore CISTA_HOME internal environment passing of config dir
 removed in commit 31e0197, that was not being passed across processes.

---
 cista/__main__.py    | 4 +++-
 cista/config.py      | 6 +++---
 cista/onlyoffice.py  | 4 +++-
 tests/test_tokens.py | 4 +++-
 4 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/cista/__main__.py b/cista/__main__.py
index 05b60a8..c9e0dba 100644
--- a/cista/__main__.py
+++ b/cista/__main__.py
@@ -185,7 +185,9 @@ def _resolve_confdir(args):
 
 def _confdir(args):
     confdir = _resolve_confdir(args)
-    config.init_confdir(confdir)
+    if confdir is not None:
+        os.environ["CISTA_HOME"] = confdir.as_posix()
+    config.init_confdir()
 
 
 def _user(args):
diff --git a/cista/config.py b/cista/config.py
index 2fb4c61..4ae4024 100644
--- a/cista/config.py
+++ b/cista/config.py
@@ -63,10 +63,10 @@ config: Config
 conffile: Path
 
 
-def init_confdir(confdir: Path | str | None = None) -> None:
+def init_confdir() -> None:
     global conffile
-    if confdir is not None:
-        home = Path(confdir).expanduser()
+    if p := os.environ.get("CISTA_HOME"):
+        home = Path(p)
     else:
         xdg = os.environ.get("XDG_CONFIG_HOME")
         home = (
diff --git a/cista/onlyoffice.py b/cista/onlyoffice.py
index c21909b..08d3a83 100644
--- a/cista/onlyoffice.py
+++ b/cista/onlyoffice.py
@@ -129,7 +129,9 @@ def log_reachable_info() -> None:
 
 def setup_docker(confdir: Path | None = None) -> int:
     """Build and run the patched OnlyOffice Docker image."""
-    config.init_confdir(confdir)
+    if confdir is not None:
+        os.environ["CISTA_HOME"] = confdir.as_posix()
+    config.init_confdir()
     if config.conffile.exists():
         config.load_config()
     else:
diff --git a/tests/test_tokens.py b/tests/test_tokens.py
index 6118a69..e9eb1be 100644
--- a/tests/test_tokens.py
+++ b/tests/test_tokens.py
@@ -1,3 +1,4 @@
+import os
 from pathlib import Path, PurePath
 from uuid import uuid4
 
@@ -23,7 +24,8 @@ def _persist_config():
 
 @pytest.fixture
 def setup_storage(tmp_path: Path):
-    config.init_confdir(tmp_path)
+    os.environ["CISTA_HOME"] = str(tmp_path)
+    config.init_confdir()
     user = config.User()
     auth.set_password(user, "secret")
     admin = config.User(privileged=True)