From 618bc9ed1a1ef4a413d83008d4549fa7a89d1d00 Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期三, 18 十二月 2019 16:50:35 +0800
Subject: [PATCH] update sh

---
 updatePatch.sh |   42 ++++++++++++++++++++++++++++++++++++------
 1 files changed, 36 insertions(+), 6 deletions(-)

diff --git a/updatePatch.sh b/updatePatch.sh
index 491934a..281e709 100755
--- a/updatePatch.sh
+++ b/updatePatch.sh
@@ -1,21 +1,51 @@
 #!/bin/bash
+
+#stop proc
+killP() {
+    pkill $1
+    ps aux | grep "$1" | grep -q -v grep
+    PROCESS_STATUS=$?
+    if [ $PROCESS_STATUS -ne 0 ]; then
+        pkill $1
+    fi
+}
+startSdkCompareWithOneParam(){
+    number=`ps -ef | grep "sdkCompare" | grep -v grep | wc -l`
+    echo $number
+    if [ $number -ne 2 ]; then
+        killP sdkCompare
+        sleep 2
+        date +%D-%T" sdkCompare start"
+        nohup ./sdkCompare $1 >/dev/null 2>&1 &
+        nohup ./sdkCompare $1 -target=es >/dev/null 2>&1 &
+        return 1
+    else
+        echo "sdkCompare is exists"
+        return 0
+    fi
+
+}
 cd /opt/vasystem/
-#stop
-./kill.sh
-sleep 3
 patchPath=$1
 files=$(ls $patchPath)
 echo "patchPath: " $patchPath
-if [ ! -f $patchPath ];then
+if [ ! -f $patchPath ]; then
     echo "$patchPath not exist"
 else
     for item in $files
     do
-        if [ -f $item ];then
+        if [ -f $item ]; then
+            killP $item
+            sleep 2
             cp $patchPath/$item /opt/vasystem/bin
+            if [[ "$item"=="sdkCompare" ]]; then
+                startSdkCompareWithOneParam sdkCompare -e=pro
+            else
+                nohup ./$item >/dev/null 2>&1 &
+            fi
         else
             echo "directory name is ${item}"
-            if [[ "$item"=="dist" ]];then
+            if [[ "$item"=="dist" ]]; then
                 echo "update web dist"
                 cp -r $patchPath/$item /opt/vasystem/web/dist
             fi

--
Gitblit v1.8.0