From 1dca34de5a38a9db4de4b9f2b191a8ac2821ec58 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BE=90=E5=8B=A4=E6=B0=91?= Date: Tue, 19 May 2026 15:42:35 +0800 Subject: [PATCH] fix(deploy): remove self-copy of nginx conf; show migration key input - cp nginx conf to itself caused error; file is already in place - migration key prompt changed from silent to visible (read -rp) Co-Authored-By: Claude Sonnet 4.6 --- scripts/deploy.sh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/scripts/deploy.sh b/scripts/deploy.sh index 1e2982d..fab8581 100755 --- a/scripts/deploy.sh +++ b/scripts/deploy.sh @@ -166,7 +166,7 @@ else _MIGRATE_KEY="" while [ -z "$_MIGRATE_KEY" ]; do - read -rsp " 请粘贴迁移密钥: " _MIGRATE_KEY; printf '\n' + read -rp " 请粘贴迁移密钥: " _MIGRATE_KEY [[ "$_MIGRATE_KEY" == pmk_* ]] || { warn "密钥格式不正确(应以 pmk_ 开头),请重新输入" _MIGRATE_KEY="" @@ -475,8 +475,7 @@ server { } NGINX_CONF # 实际使用仓库中的文件(已跳过上方 heredoc) -cp "$NGINX_SRC" "$ROOT_DIR/config/nginx/conf.d/xuqm.conf" -ok "config/nginx/conf.d/xuqm.conf 已写入(来自 $NGINX_SRC)" +ok "config/nginx/conf.d/xuqm.conf 就绪(使用仓库内文件)" # config/vendors/push.env — 推送服务厂商凭据(初始为关闭状态,按需开启) mkdir -p "$ROOT_DIR/config/vendors"