From e034b17989d3bd4bfe807f7f7e7828176989a8f4 Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期三, 18 十二月 2019 21:02:46 +0800
Subject: [PATCH] fix chunkAlignNum
---
updatePatch.sh | 61 ++++++++++++++++++++++++------
1 files changed, 49 insertions(+), 12 deletions(-)
diff --git a/updatePatch.sh b/updatePatch.sh
old mode 100644
new mode 100755
index 491934a..614272d
--- a/updatePatch.sh
+++ b/updatePatch.sh
@@ -1,27 +1,64 @@
#!/bin/bash
-cd /opt/vasystem/
-#stop
-./kill.sh
-sleep 3
+
+#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/bin
patchPath=$1
+zipPath=$2
+chunkPath=$3
files=$(ls $patchPath)
echo "patchPath: " $patchPath
-if [ ! -f $patchPath ];then
- echo "$patchPath not exist"
+if [ ! -d $patchPath ]; then
+ echo "$patchPath not exist,patch update fail"
else
for item in $files
do
- if [ -f $item ];then
+ if [ -x $patchPath/$item ]; then
+ echo "start update proc ${item}"
+ 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"
+ else
+ nohup ./$item >/dev/null 2>&1 &
+ echo "update ${item} success"
+ 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
+ else
+ echo "unknown directory ${item}"
fi
fi
done
+ sleep 3
+ echo "patch update success"
fi
-./daemon.sh -shm
-sleep 3
-echo "patch update success"
\ No newline at end of file
+rm -rf $patchPath $zipPath $chunkPath
\ No newline at end of file
--
Gitblit v1.8.0