diff --git a/shell/share.sh b/shell/share.sh index 62a43e10..e2c83bd4 100755 --- a/shell/share.sh +++ b/shell/share.sh @@ -324,7 +324,7 @@ git_pull_scripts() { git fetch --all exit_status=$? git reset --hard &>/dev/null - git pull &>/dev/null + git pull --allow-unrelated-histories &>/dev/null unset_proxy cd $dir_current diff --git a/shell/update.sh b/shell/update.sh index 47f0afa6..d56b7a3e 100755 --- a/shell/update.sh +++ b/shell/update.sh @@ -243,6 +243,8 @@ usage() { update_qinglong() { patch_version + pnpm install -g pm2 &>/dev/null + local no_restart="$1" [[ -f $dir_root/package.json ]] && ql_depend_old=$(cat $dir_root/package.json) reset_romote_url ${dir_root} "https://github.com/whyour/qinglong.git" ${current_branch}