From d499a6b2ddc73cf5ff71e326b1f65e70db4dd098 Mon Sep 17 00:00:00 2001
From: MickLesk <mickey.leskowitz@gmail.com>
Date: Mon, 20 Jul 2026 09:20:54 +0200
Subject: [PATCH] Update gotify.sh

---
 ct/gotify.sh | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/ct/gotify.sh b/ct/gotify.sh
index 671490c8c..cf15fc124 100644
--- a/ct/gotify.sh
+++ b/ct/gotify.sh
@@ -36,14 +36,20 @@ function update_script() {
     fetch_and_deploy_gh_release "gotify" "gotify/server" "prebuild" "latest" "/opt/gotify" "gotify-linux-$(arch_resolve).zip"
     chmod +x /opt/gotify/gotify-linux-$(arch_resolve)
 
-    if [[ -f /opt/gotify/config.yml && ! -f /opt/gotify/gotify-server.env ]]; then
-      msg_info "Migrating config.yml to env format (Gotify 3.x)"
-      if /opt/gotify/gotify-linux-$(arch_resolve) migrate-config /opt/gotify/config.yml >/opt/gotify/gotify-server.env 2>/dev/null; then
-        mv /opt/gotify/config.yml /opt/gotify/config.yml.bak
-        msg_ok "Migrated config.yml → gotify-server.env (backup: config.yml.bak)"
-      else
-        rm -f /opt/gotify/gotify-server.env
-        msg_warn "config.yml migration failed — left config.yml in place, review manually"
+    if [[ ! -f /opt/gotify/gotify-server.env ]]; then
+      gotify_old_config=""
+      for f in /opt/gotify/config.yml /etc/gotify/config.yml; do
+        [[ -f "$f" ]] && gotify_old_config="$f" && break
+      done
+      if [[ -n "$gotify_old_config" ]]; then
+        msg_info "Migrating ${gotify_old_config} to env format (Gotify 3.x)"
+        if /opt/gotify/gotify-linux-$(arch_resolve) migrate-config "$gotify_old_config" >/opt/gotify/gotify-server.env 2>/dev/null; then
+          mv "$gotify_old_config" "${gotify_old_config}.bak"
+          msg_ok "Migrated config to /opt/gotify/gotify-server.env (backup: ${gotify_old_config}.bak)"
+        else
+          rm -f /opt/gotify/gotify-server.env
+          msg_warn "Config migration failed — left ${gotify_old_config} in place, review manually"
+        fi
       fi
     fi