pyenv ubuntu

npm_install.py

@@ -212,24 +212,45 @@ def sync_backup_nginx_conf():
 
 
 def setup_certbot_venv(venv_dir: Path = Path("/opt/certbot")):
+    # Parametry
     PYENV_ROOT = Path("/opt/npm/.pyenv")
     PYENV_OWNER = "npm"
     PYTHON_VERSION = "3.11.11"
 
+    # Rozpoznanie dystrybucji
     def _is_ubuntu() -> bool:
         try:
             with open("/etc/os-release") as f:
                 data = f.read().lower()
-            return "id=ubuntu" in data.splitlines()[0] or "id=ubuntu" in data
+            return "id=ubuntu" in data
         except Exception:
             return False
 
+    # Instalacja pyenv przez installer (curl | bash) do PYENV_ROOT
+    def ensure_pyenv_installed_with_installer(pyenv_root: Path, owner: str):
+        if (pyenv_root / "bin" / "pyenv").exists():
+            return
+        apt_try_install(["curl", "git", "ca-certificates"])
+        parent_home = pyenv_root.parent  # /opt/npm
+        Path(parent_home).mkdir(parents=True, exist_ok=True)
+        run(["chown", "-R", f"{owner}:{owner}", str(parent_home)], check=False)
+        run([
+            "sudo", "-u", owner, "-H", "env",
+            f"HOME={parent_home}",
+            "bash", "-lc",
+            "curl -fsSL https://pyenv.run | bash"
+        ], check=True)
+        src = parent_home / ".pyenv"
+        if src.exists() and str(src) != str(pyenv_root):
+            run(["sudo", "-u", owner, "-H", "bash", "-lc",
+                 f'mv "{src}" "{pyenv_root}"'], check=True)
+
+    # Zależności
     build_deps = [
         "build-essential","gcc","make","pkg-config","libssl-dev","zlib1g-dev",
         "libbz2-dev","libreadline-dev","libsqlite3-dev","tk-dev","libncursesw5-dev",
         "libgdbm-dev","libffi-dev","uuid-dev","liblzma-dev","ca-certificates","curl","git"
     ]
-
     if _is_ubuntu():
         apt_try_install(build_deps)
     else:
@@ -239,35 +260,29 @@ def setup_certbot_venv(venv_dir: Path = Path("/opt/certbot")):
             run(["apt-get", "update"], check=False)
             run(["apt-get", "install", "-y", "pyenv"] + build_deps, check=False)
 
+    # Katalogi i właściciel
     Path("/opt/npm").mkdir(parents=True, exist_ok=True)
     PYENV_ROOT.mkdir(parents=True, exist_ok=True)
     run(["chown", "-R", f"{PYENV_OWNER}:{PYENV_OWNER}", "/opt/npm"], check=False)
 
-    if _is_ubuntu() and not (PYENV_ROOT / "bin" / "pyenv").exists():
-        run([
-            "sudo","-u", PYENV_OWNER, "-H", "bash","-lc",
-            f'git clone --depth=1 https://github.com/pyenv/pyenv.git "{PYENV_ROOT}"'
-        ], check=True)
+    # Ubuntu: instalacja pyenv instalatorem; Debian: może być z APT
+    if _is_ubuntu():
+        ensure_pyenv_installed_with_installer(PYENV_ROOT, PYENV_OWNER)
 
+    # Wybór binarki pyenv
     PYENV_BIN_CANDIDATES = [
         str(PYENV_ROOT / "bin" / "pyenv"),
-        "pyenv", "/usr/bin/pyenv", "/usr/lib/pyenv/bin/pyenv"
+        "/usr/lib/pyenv/bin/pyenv",
+        "/usr/bin/pyenv",
+        "pyenv",
     ]
     pyenv_bin = next((c for c in PYENV_BIN_CANDIDATES if shutil.which(c)), None)
     if not pyenv_bin and (PYENV_ROOT / "bin" / "pyenv").exists():
         pyenv_bin = str(PYENV_ROOT / "bin" / "pyenv")
     if not pyenv_bin:
-        raise RuntimeError("Nie znaleziono 'pyenv' (APT lub Git).")
-
-    with step(f"Installing Python {PYTHON_VERSION} via pyenv into {PYENV_ROOT}"):
-        run(["sudo","-u", PYENV_OWNER, "-H", "bash","-lc",
-            f'export PYENV_ROOT="{PYENV_ROOT}"; '
-            f'export PATH="$PYENV_ROOT/bin:$PATH"; '
-            f'eval "$({pyenv_bin} init -)"; '
-            f'"{pyenv_bin}" install -s {PYTHON_VERSION}; '
-            f'"{pyenv_bin}" versions'
-        ])
+        raise RuntimeError("Nie znaleziono 'pyenv' (APT lub installer).")
 
+    # Snippet profilowy
     profile_snippet = f"""# Auto-generated by setup_certbot_venv
 # Ustawienia pyenv dla uzytkownika '{PYENV_OWNER}'
 if [ -d "{PYENV_ROOT}" ]; then
@@ -275,39 +290,46 @@ if [ -d "{PYENV_ROOT}" ]; then
   case ":$PATH:" in *":{PYENV_ROOT}/bin:"*) ;; *) PATH="{PYENV_ROOT}/bin:$PATH" ;; esac
   case ":$PATH:" in *":/usr/lib/pyenv/bin:"*) ;; *) PATH="/usr/lib/pyenv/bin:$PATH" ;; esac
   export PATH
-  case "$-" in *i*) _interactive=1 ;; *) _interactive=0 ;; esac
-  if [ "$_interactive" = 1 ] && {{ [ "${{USER:-}}" = "{PYENV_OWNER}" ] || [ "${{SUDO_USER:-}}" = "{PYENV_OWNER}" ]; }}; then
-    if command -v pyenv >/dev/null 2>&1; then
-      eval "$(pyenv init -)"
-    elif [ -x "{PYENV_ROOT}/bin/pyenv" ]; then
-      eval "$("{PYENV_ROOT}/bin/pyenv" init -)"
-    fi
-  fi
+  eval "$({pyenv_bin} init -)"
 fi
 """
     write_file(Path("/etc/profile.d/npm-pyenv.sh"), profile_snippet, 0o644)
 
-    python311 = PYENV_ROOT / "versions" / PYTHON_VERSION / "bin" / "python3.11"
-    if not python311.exists():
-        python311 = PYENV_ROOT / "versions" / PYTHON_VERSION / "bin" / "python3"
-    if not python311.exists():
-        raise RuntimeError(f"Nie znaleziono interpretera Pythona {PYTHON_VERSION} w {PYENV_ROOT}/versions/.")
+    # Instalacja Pythona
+    run([
+        "sudo","-u", PYENV_OWNER, "-H", "bash","-lc",
+        f'export PYENV_ROOT="{PYENV_ROOT}"; '
+        f'export PATH="$PYENV_ROOT/bin:$PATH"; '
+        f'eval "$({pyenv_bin} init -)"; '
+        f'"{pyenv_bin}" install -s {PYTHON_VERSION}; '
+        f'"{pyenv_bin}" versions'
+    ], check=True)
 
-    venv_bin = venv_dir / "bin"
-    pip_path = venv_bin / "pip"
-    certbot_path = venv_bin / "certbot"
+    # Ścieżka do python3
+    py_cmd = run([
+        "sudo","-u", PYENV_OWNER, "-H", "bash","-lc",
+        f'export PYENV_ROOT="{PYENV_ROOT}"; '
+        f'export PATH="$PYENV_ROOT/bin:$PATH"; '
+        f'echo "$({pyenv_bin} prefix {PYTHON_VERSION})/bin/python3"'
+    ], check=True)
+    python_path = (py_cmd.stdout.decode().strip() if hasattr(py_cmd, "stdout") else "").strip()
+    if not python_path:
+        raise RuntimeError("Nie udało się ustalić ścieżki do python3 z pyenv.")
 
-    with step(f"Preparing Certbot venv at {venv_dir} (Python {PYTHON_VERSION})"):
+    # Venv i pakiety
     venv_dir.mkdir(parents=True, exist_ok=True)
-        if not venv_dir.exists() or not pip_path.exists():
-            run([str(python311), "-m", "venv", str(venv_dir)])
+    run([python_path, "-m", "venv", str(venv_dir)], check=True)
+
+    pip_path = venv_dir / "bin" / "pip"
+    certbot_bin = venv_dir / "bin" / "certbot"
 
     env_build = os.environ.copy()
     env_build["SETUPTOOLS_USE_DISTUTILS"] = "local"
 
-        run([str(pip_path), "install", "-U", "pip", "setuptools", "wheel"], env=env_build)
-        run([str(pip_path), "install", "-U", "cryptography", "cffi", "certbot", "tldextract"], env=env_build)
+    run([str(venv_dir / "bin" / "python"), "-m", "pip", "install", "-U", "pip", "setuptools", "wheel"], env=env_build, check=True)
+    run([str(pip_path), "install", "-U", "cryptography", "cffi", "certbot", "tldextract"], env=env_build, check=True)
 
+    # Symlink
     Path("/usr/local/bin").mkdir(parents=True, exist_ok=True)
     target = Path("/usr/local/bin/certbot")
     if target.exists() or target.is_symlink():
@@ -315,16 +337,16 @@ fi
             target.unlink()
         except Exception:
             pass
-        target.symlink_to(certbot_path)
+    target.symlink_to(certbot_bin)
 
-        cb_ver = run_out([str(certbot_path), "--version"], check=False) or ""
+    # Informacje
+    cb_ver = run_out([str(certbot_bin), "--version"], check=False) or ""
     pip_ver = run_out([str(pip_path), "--version"], check=False) or ""
     print(f"Certbot: {cb_ver.strip()} | Pip: {pip_ver.strip()}")
 
     run(["chown", "-R", f"{PYENV_OWNER}:{PYENV_OWNER}", str(PYENV_ROOT)], check=False)
 
 
-
 def configure_letsencrypt():
     with step("configure letsencrypt"):
         run(["chown", "-R", "npm:npm", "/opt/certbot"], check=False)