From 20a7ab64deac24374efc037a56904fc026b5ac4a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mateusz=20Gruszczy=C5=84ski?=
 <mateusz.gruszczynski@firma.interia.pl>
Date: Fri, 24 Oct 2025 14:59:44 +0200
Subject: [PATCH] fix pyenv

---
 npm_install.py | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/npm_install.py b/npm_install.py
index 413c512..6a484ee 100644
--- a/npm_install.py
+++ b/npm_install.py
@@ -248,15 +248,19 @@ def setup_certbot_venv(venv_dir: Path = Path("/opt/certbot")):
         "PATH": "/usr/lib/pyenv/bin:/usr/bin:/bin"
     })
     with step(f"Installing Python {PYTHON_VERSION} via pyenv into {PYENV_ROOT}"):
+        cmd = (
+            'export HOME=/opt/npm; '
+            f'export PYENV_ROOT="{PYENV_ROOT}"; '
+            'export PATH="$PYENV_ROOT/bin:/usr/lib/pyenv/bin:/usr/bin:/bin"; '
+            'mkdir -p "$PYENV_ROOT"; cd /opt/npm; '
+            f'/usr/lib/pyenv/bin/pyenv install -s {PYTHON_VERSION}'
+        )
         run([
-            "sudo", "-u", PYENV_OWNER, "-s",
-            "env",
-            f"HOME={env_pyenv['HOME']}",
-            f"PYENV_ROOT={env_pyenv['PYENV_ROOT']}",
-            f"PATH={env_pyenv['PATH']}",
-            "bash", "-lc",
-            f'cd /opt/npm && "{pyenv_bin}" install -s {PYTHON_VERSION}'
-        ], env=env_pyenv)
+            "sudo", "-H", "-u", PYENV_OWNER,
+            "--preserve-env=HOME,PYENV_ROOT,PATH",
+            "bash", "-lc", cmd
+        ])
+
 
     profile_snippet = f"""# Auto-generated by setup_certbot_venv
 # Ustawienia pyenv dla uzytkownika '{PYENV_OWNER}'