From 826617d7376cc09ff6fc3d46baa6e1b72d5c7bfa Mon Sep 17 00:00:00 2001 From: whm <973418690@qq.com> Date: Tue, 17 Mar 2026 01:49:29 +0800 Subject: [PATCH] fix: ensure .sh scripts are LF in repo, add README note for bash\\r Made-with: Cursor --- README.md | 6 ++++++ pull-and-restart.sh | 1 + restart.sh | 1 + 3 files changed, 8 insertions(+) diff --git a/README.md b/README.md index 12776b2..877ed02 100644 --- a/README.md +++ b/README.md @@ -53,6 +53,12 @@ npm run dev chmod +x pull-and-restart.sh restart.sh ``` +若执行脚本报错 `bash\r: No such file or directory`(行尾为 Windows 的 CRLF),在项目根目录执行一次: +```bash +sed -i 's/\r$//' pull-and-restart.sh restart.sh +``` +再执行 `chmod +x pull-and-restart.sh restart.sh` 后重试。 + - **拉取代码并重启**:`cd ~/project/yh_web && ./pull-and-restart.sh` - **仅重启服务**:`cd ~/project/yh_web && ./restart.sh` - 对外域名:https://yuheng.yuxindazhineng.com diff --git a/pull-and-restart.sh b/pull-and-restart.sh index 763dda4..1b7e6c8 100644 --- a/pull-and-restart.sh +++ b/pull-and-restart.sh @@ -1,5 +1,6 @@ #!/usr/bin/env bash # 拉取代码并重启项目(线上项目根目录:/home/yxd/project/yh_web) +# 行尾:LF(.gitattributes) # 用法:cd /home/yxd/project/yh_web && ./pull-and-restart.sh # 或指定目录:PROJECT_ROOT=/home/yxd/project/yh_web ./pull-and-restart.sh set -e diff --git a/restart.sh b/restart.sh index fed21d7..03e31cd 100644 --- a/restart.sh +++ b/restart.sh @@ -1,5 +1,6 @@ #!/usr/bin/env bash # 仅重启项目(不拉代码),适用于配置/环境变更后重启 +# 行尾:LF(.gitattributes) # 用法:cd /home/yxd/project/yh_web && ./restart.sh # 或:PROJECT_ROOT=/home/yxd/project/yh_web ./restart.sh set -e