From d9c47298a1591f942c3a5b5f777518e8c88fc808 Mon Sep 17 00:00:00 2001
From: SuperJacky6 <adding2003@gmail.com>
Date: Sat, 8 Aug 2026 17:31:16 +0800
Subject: [PATCH] v9

---
 .gitea/workflows/deploy-on-merge.yml | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/.gitea/workflows/deploy-on-merge.yml b/.gitea/workflows/deploy-on-merge.yml
index 678182c..446649c 100644
--- a/.gitea/workflows/deploy-on-merge.yml
+++ b/.gitea/workflows/deploy-on-merge.yml
@@ -18,9 +18,9 @@ jobs:
 
       - name: 远程执行部署
         run: |
-          ssh -i ~/.ssh/deploy_key ${{ secrets.DEPLOY_USER }}@${{ secrets.DEPLOY_HOST }} <<-'EOF'
+          ssh -i ~/.ssh/deploy_key ${{ secrets.DEPLOY_USER }}@${{ secrets.DEPLOY_HOST }} <<EOF
             set -e
-            cd $DEPLOY_PATH
+            cd ${{ env.DEPLOY_PATH }}
             git fetch origin main
 
             # 备份运行时db
@@ -30,8 +30,8 @@ jobs:
 
             git checkout origin/main -- .
 
-            CHANGED=$(git diff --name-only HEAD FETCH_HEAD | grep "data/miniapp_v3.db" || true)
-            if [ -z "$CHANGED" ]; then
+            CHANGED=\$(git diff --name-only HEAD FETCH_HEAD | grep "data/miniapp_v3.db" || true)
+            if [ -z "\$CHANGED" ]; then
               if [ -f data/miniapp_v3.db.tmp ]; then
                 cp data/miniapp_v3.db.tmp data/miniapp_v3.db
               fi
@@ -42,12 +42,12 @@ jobs:
             chown -R www:www .
 
             # 获取gunicorn master进程，发送HUP优雅重载
-            MASTER_PID=$(pgrep -f "gunicorn_conf.py" -P 1)
-            echo "Detected gunicorn master PID: $MASTER_PID"
-            if [ -n "$MASTER_PID" ]; then
-                kill -HUP "$MASTER_PID"
+            MASTER_PID=\$(pgrep -f "gunicorn_conf.py" -P 1)
+            echo "Detected gunicorn master PID: \$MASTER_PID"
+            if [ -n "\$MASTER_PID" ]; then
+                kill -HUP "\$MASTER_PID"
                 echo "✅ Graceful reload signal sent"
             else
                 echo "⚠️ Gunicorn master not found, skip reload"
             fi
-          EOF
\ No newline at end of file
+EOF
\ No newline at end of file