From 12d81fa9d6c9351a441c1bdbbf3d85eb7c1010e7 Mon Sep 17 00:00:00 2001
From: MickLesk <47820557+MickLesk@users.noreply.github.com>
Date: Fri, 9 Oct 2026 20:44:46 +0200
Subject: [PATCH] Radicale: enable the extras only once the code defines them

argon2 is an extra since v3.5.4 and uv refuses unknown extras, so patching
before the release update broke older installs. Patch after it instead,
and only when pyproject.toml defines the extra.
---
 ct/radicale.sh | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/ct/radicale.sh b/ct/radicale.sh
index bf2bb732b..bc87e272e 100644
--- a/ct/radicale.sh
+++ b/ct/radicale.sh
@@ -30,14 +30,6 @@ function update_script() {
     exit
   fi
 
-  if grep -q 'uv run -m radicale' /etc/systemd/system/radicale.service; then
-    msg_info "Enabling bcrypt/argon2 support"
-    sed -i 's|uv run -m radicale|uv run --extra bcrypt --extra argon2 -m radicale|' /etc/systemd/system/radicale.service
-    systemctl daemon-reload
-    systemctl restart radicale
-    msg_ok "Enabled bcrypt/argon2 support"
-  fi
-
   if check_for_gh_release "Radicale" "Kozea/Radicale"; then
     msg_info "Stopping service"
     systemctl stop radicale
@@ -78,6 +70,14 @@ EOF
     msg_ok "Started service"
     msg_ok "Updated Successfully!"
   fi
+
+  if grep -q 'uv run -m radicale' /etc/systemd/system/radicale.service && grep -q '^argon2 *=' /opt/radicale/pyproject.toml; then
+    msg_info "Enabling bcrypt/argon2 support"
+    sed -i 's|uv run -m radicale|uv run --extra bcrypt --extra argon2 -m radicale|' /etc/systemd/system/radicale.service
+    systemctl daemon-reload
+    systemctl restart radicale
+    msg_ok "Enabled bcrypt/argon2 support"
+  fi
   exit
 }