From 9cfa4af2b20627016c3280fdfd46c53bea5ca07a Mon Sep 17 00:00:00 2001
From: whyour <imwhyour@gmail.com>
Date: Thu, 24 Feb 2022 22:36:49 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0git=20pull=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 shell/share.sh  | 2 +-
 shell/update.sh | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

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}