Merge 6a766f7882 into 0becf9d574

kiauh/components/moonraker/moonraker_setup.py

@@ -53,7 +53,8 @@ from utils.sys_utils import (
     cmd_sysctl_manage,
     cmd_sysctl_service,
     create_python_venv,
-    get_distro_info,
+    get_distro_name,
+    get_distro_version,
     install_python_requirements,
     parse_packages_from_file,
 )
@@ -162,10 +163,8 @@ def install_moonraker_packages() -> None:
             f"Parsing system dependencies from {MOONRAKER_DEPS_JSON_FILE.name} ..."
         )
         parsed_sysdeps = parse_sysdeps_file(MOONRAKER_DEPS_JSON_FILE)
-        distro_name, distro_version = get_distro_info()
+        distro_name = get_distro_name().lower()
-
+        distro_version = get_distro_version()
-        Logger.print_info(f"Distro name: {distro_name}")
-        Logger.print_info(f"Distro version: {distro_version}")
 
         for dep in parsed_sysdeps.get(distro_name, []):
             pkg = dep[0].strip()

kiauh/utils/sys_utils.py

@@ -19,7 +19,7 @@ import urllib.error
 import urllib.request
 from pathlib import Path
 from subprocess import DEVNULL, PIPE, CalledProcessError, Popen, check_output, run
-from typing import List, Literal, Set, Tuple
+from typing import List, Literal, Set
 
 from core.constants import SYSTEMD
 from core.logger import Logger
@@ -540,31 +540,9 @@ def get_service_file_path(instance_type: type, suffix: str) -> Path:
 
     return file_path
 
+def get_distro_name() -> str:
+    return check_output(["lsb_release", "-is"]).decode().strip()
 
-def get_distro_info() -> Tuple[str, str]:
-    distro_info: str = check_output(["cat", "/etc/os-release"]).decode().strip()
 
-    if not distro_info:
+def get_distro_version() -> str:
-        raise ValueError("Error reading distro info!")
+    return check_output(["lsb_release", "-rs"]).decode().strip()
-
-    distro_id: str = ""
-    distro_id_like: str = ""
-    distro_version: str = ""
-
-    for line in distro_info.split("\n"):
-        if line.startswith("ID="):
-            distro_id = line.split("=")[1].strip('"').strip()
-        if line.startswith("ID_LIKE="):
-            distro_id_like = line.split("=")[1].strip('"').strip()
-        if line.startswith("VERSION_ID="):
-            distro_version = line.split("=")[1].strip('"').strip()
-
-    if distro_id == "raspbian":
-        distro_id = distro_id_like
-
-    if not distro_id:
-        raise ValueError("Error reading distro id!")
-    if not distro_version:
-        raise ValueError("Error reading distro version!")
-
-    return distro_id.lower(), distro_version

resources/moonraker.conf

@@ -16,7 +16,6 @@ trusted_clients:
 cors_domains:
     *.lan
     *.local
-    *.internal
     *://localhost
     *://localhost:*
     *://my.mainsail.xyz