Compare commits
2 Commits
b624bac9b0
...
826617d737
| Author | SHA1 | Date | |
|---|---|---|---|
| 826617d737 | |||
| a0df3a8a41 |
2
.gitattributes
vendored
Normal file
2
.gitattributes
vendored
Normal file
@@ -0,0 +1,2 @@
|
|||||||
|
# 强制 shell 脚本使用 LF,避免在 Linux 上出现 bash\r 错误
|
||||||
|
*.sh text eol=lf
|
||||||
@@ -53,6 +53,12 @@ npm run dev
|
|||||||
chmod +x pull-and-restart.sh restart.sh
|
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 && ./pull-and-restart.sh`
|
||||||
- **仅重启服务**:`cd ~/project/yh_web && ./restart.sh`
|
- **仅重启服务**:`cd ~/project/yh_web && ./restart.sh`
|
||||||
- 对外域名:https://yuheng.yuxindazhineng.com
|
- 对外域名:https://yuheng.yuxindazhineng.com
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
#!/usr/bin/env bash
|
#!/usr/bin/env bash
|
||||||
# 拉取代码并重启项目(线上项目根目录:/home/yxd/project/yh_web)
|
# 拉取代码并重启项目(线上项目根目录:/home/yxd/project/yh_web)
|
||||||
|
# 行尾:LF(.gitattributes)
|
||||||
# 用法:cd /home/yxd/project/yh_web && ./pull-and-restart.sh
|
# 用法:cd /home/yxd/project/yh_web && ./pull-and-restart.sh
|
||||||
# 或指定目录:PROJECT_ROOT=/home/yxd/project/yh_web ./pull-and-restart.sh
|
# 或指定目录:PROJECT_ROOT=/home/yxd/project/yh_web ./pull-and-restart.sh
|
||||||
set -e
|
set -e
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
#!/usr/bin/env bash
|
#!/usr/bin/env bash
|
||||||
# 仅重启项目(不拉代码),适用于配置/环境变更后重启
|
# 仅重启项目(不拉代码),适用于配置/环境变更后重启
|
||||||
|
# 行尾:LF(.gitattributes)
|
||||||
# 用法:cd /home/yxd/project/yh_web && ./restart.sh
|
# 用法:cd /home/yxd/project/yh_web && ./restart.sh
|
||||||
# 或:PROJECT_ROOT=/home/yxd/project/yh_web ./restart.sh
|
# 或:PROJECT_ROOT=/home/yxd/project/yh_web ./restart.sh
|
||||||
set -e
|
set -e
|
||||||
|
|||||||
Reference in New Issue
Block a user