diff --git a/shell/check.sh b/shell/check.sh index be1cbc7f..9dbad018 100644 --- a/shell/check.sh +++ b/shell/check.sh @@ -98,6 +98,7 @@ check_pm2() { main() { echo -e "=====> 开始检测" + pnpm install -g pm2 copy_dep check_ql check_nginx diff --git a/shell/update.sh b/shell/update.sh index cc929b86..4fb6b387 100755 --- a/shell/update.sh +++ b/shell/update.sh @@ -243,8 +243,6 @@ usage() { update_qinglong() { patch_version - pnpm install -g pm2 &>/dev/null - local no_restart="$1" local all_branch=$(git branch -a) local primary_branch="master" @@ -279,7 +277,7 @@ update_qinglong() { local static_version=$(cat /ql/src/version.ts | perl -pe "s|.*\'(.*)\';\.*|\1|" | head -1) echo -e "\n当前版本 $static_version...\n" - rm -rf $dir_static + rm -rf $dir_static/* cp -rf $ql_static_repo/* $dir_static if [[ $no_restart != "no-restart" ]]; then nginx -s reload 2>/dev/null || nginx -c /etc/nginx/nginx.conf