From a789f7bd273fb5659c0583c45b2e9cdb7102f1d3 Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期四, 19 十二月 2019 17:48:46 +0800
Subject: [PATCH] update shell

---
 updatePatch.sh |   24 ++++++++++++------------
 1 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/updatePatch.sh b/updatePatch.sh
index 221efbc..099f40d 100755
--- a/updatePatch.sh
+++ b/updatePatch.sh
@@ -11,7 +11,6 @@
 }
 startSdkCompareWithOneParam(){
     number=`ps -ef | grep "sdkCompare" | grep -v grep | wc -l`
-    echo $number
     if [ $number -ne 2 ]; then
         killP sdkCompare
         sleep 2
@@ -20,7 +19,7 @@
         nohup ./sdkCompare $1 -target=es >/dev/null 2>&1 &
         return 1
     else
-        echo "sdkCompare is exists"
+        echo "sdkCompare is exists">>upgrade.out
         return 0
     fi
 
@@ -30,35 +29,36 @@
 zipPath=$2
 chunkPath=$3
 files=$(ls $patchPath)
-echo "patchPath: " $patchPath
+echo "patchPath: " $patchPath>>upgrade.out
 if [ ! -d $patchPath ]; then
-    echo "$patchPath not exist,patch update fail"
+    echo "$patchPath not exist,patch update fail">>upgrade.out
 else
     for item in $files
     do
         if [ -f $patchPath/$item ]; then
-            echo "start update proc ${item}"
+            echo "start update proc ${item}">>upgrade.out
             killP $item
             sleep 2
             cp $patchPath/$item /opt/vasystem/bin
             chmod +x /opt/vasystem/bin/$item
             if [ "$item" = "sdkCompare" ]; then
                 startSdkCompareWithOneParam -e=pro
-                echo "update ${item} success"
+                echo "update ${item} success">>upgrade.out
             else
                 nohup ./$item >/dev/null 2>&1 &
-                echo "update ${item} success"
+                echo "update ${item} success">>upgrade.out
             fi
         else
             if [ "$item" = "dist" ]; then
-                echo "update web dist"
+                echo "update web dist">>upgrade.out
                 cp -r $patchPath/$item /opt/vasystem/web/dist
             else 
-                echo "unknown directory ${item}"
+                echo "unknown directory ${item}">>upgrade.out
             fi
         fi
     done
-    sleep 3
-    echo "patch update success"
 fi
-rm -rf $patchPath $zipPath $chunkPath
\ No newline at end of file
+echo "exec rm -rf ${patchPath} ${zipPath} ${chunkPath}">>upgrade.out
+rm -rf $patchPath $zipPath $chunkPath
+echo "rm success">>upgrade.out
+exit 0
\ No newline at end of file

--
Gitblit v1.8.0