diff --git a/shell/check.sh b/shell/check.sh index b9ad458a..787719e5 100644 --- a/shell/check.sh +++ b/shell/check.sh @@ -90,6 +90,9 @@ check_pm2() { main() { echo -e "=====> 开始检测" npm i -g pnpm + pnpm setup &>/dev/null + source ~/.bashrc + pnpm install -g &>/dev/null pnpm add -g pm2 copy_dep check_ql diff --git a/shell/update.sh b/shell/update.sh index 736d5a54..b9bd6163 100755 --- a/shell/update.sh +++ b/shell/update.sh @@ -295,6 +295,11 @@ update_qinglong() { } patch_version() { + # 兼容pnpm@7 + pnpm setup &>/dev/null + source ~/.bashrc + pnpm install -g &>/dev/null + if [[ -f "$dir_root/db/cookie.db" ]]; then echo -e "检测到旧的db文件,拷贝为新db...\n" mv $dir_root/db/cookie.db $dir_root/db/env.db @@ -306,10 +311,6 @@ patch_version() { pnpm add -g ts-node typescript tslib fi - # 兼容pnpm@7 - pnpm setup - source ~/.bashrc - git config --global pull.rebase false cp -f $dir_root/.env.example $dir_root/.env