From d7013429510b3676e13d0665c14c3e9cdab69325 Mon Sep 17 00:00:00 2001
From: Lloyd <lloyd@rightup.co.uk>
Date: Wed, 11 Mar 2026 10:27:20 +0000
Subject: [PATCH] add error handling for service file update and migrate
 service unit to fix PYTHONPATH and WorkingDirectory

---
 manage.sh                        |  4 +++-
 repeater/web/update_endpoints.py | 32 +++++++++++++++++++++++++++++---
 2 files changed, 32 insertions(+), 4 deletions(-)

diff --git a/manage.sh b/manage.sh
index 77c48c1..f5189ee 100755
--- a/manage.sh
+++ b/manage.sh
@@ -623,7 +623,9 @@ upgrade_repeater() {
 
         echo "[4/9] Installing files..."
         SCRIPT_DIR="$(dirname "$0")"
-        cp "$SCRIPT_DIR/pymc-repeater.service" /etc/systemd/system/ 2>/dev/null || true
+        if ! cp "$SCRIPT_DIR/pymc-repeater.service" /etc/systemd/system/; then
+            echo "    ⚠ Warning: Failed to update service file – old service file may remain"
+        fi
         cp "$SCRIPT_DIR/radio-settings.json" /var/lib/pymc_repeater/ 2>/dev/null || true
         cp "$SCRIPT_DIR/radio-presets.json" /var/lib/pymc_repeater/ 2>/dev/null || true
         echo "    ✓ Files updated"
diff --git a/repeater/web/update_endpoints.py b/repeater/web/update_endpoints.py
index 10c046f..4243c96 100644
--- a/repeater/web/update_endpoints.py
+++ b/repeater/web/update_endpoints.py
@@ -643,6 +643,25 @@ def _do_check() -> None:
         logger.warning(f"[Update] Version check failed: {msg}")
 
 
+def _migrate_service_unit() -> None:
+    """Strip legacy PYTHONPATH and fix WorkingDirectory in the systemd service unit.
+    """
+    import subprocess as _sp
+    _SVC_UNIT = "/etc/systemd/system/pymc-repeater.service"
+    try:
+        _sp.run(["sed", "-i", "/^Environment=.*PYTHONPATH/d", _SVC_UNIT], check=False)
+        _sp.run(
+            ["sed", "-i",
+             "s|WorkingDirectory=/opt/pymc_repeater|WorkingDirectory=/var/lib/pymc_repeater|",
+             _SVC_UNIT],
+            check=False,
+        )
+        _sp.run(["systemctl", "daemon-reload"], check=False)
+        logger.info("[Update] Service unit migration applied (root path).")
+    except Exception as exc:
+        logger.warning(f"[Update] Service unit migration failed: {exc}")
+
+
 def _do_install() -> None:
 
     channel = _state.channel
@@ -681,6 +700,7 @@ def _do_install() -> None:
     is_root = (_os.geteuid() == 0)
 
     if is_root:
+        _migrate_service_unit()
         install_spec = (
             f"pymc_repeater[hardware] @ git+https://github.com/{GITHUB_OWNER}/{GITHUB_REPO}.git@{channel}"
         )
@@ -710,15 +730,21 @@ def _do_install() -> None:
 
     if success:
         _cleanup_stale_dist_info()
-        _state.finish_install(True, f"Upgraded to latest on channel '{channel}'")
         _state.append_line("[pyMC updater] Restarting service in 3 seconds…")
         time.sleep(3)
+        restart_ok = False
+        restart_msg = "Restart not attempted"
         try:
             from repeater.service_utils import restart_service
-            ok, msg = restart_service()
-            logger.info(f"[Update] Post-upgrade restart: {msg}")
+            restart_ok, restart_msg = restart_service()
+            logger.info(f"[Update] Post-upgrade restart: {restart_msg}")
         except Exception as exc:
+            restart_msg = str(exc)
             logger.warning(f"[Update] Could not restart service: {exc}")
+        if restart_ok:
+            _state.finish_install(True, f"Upgraded to latest on channel '{channel}' – service restarted")
+        else:
+            _state.finish_install(False, f"Upgrade succeeded but service restart failed: {restart_msg}")
     else:
         _state.finish_install(False, "pip install failed – see progress log for details")