From 14d4970e82a8fc3ea390a417301dc10119f314d6 Mon Sep 17 00:00:00 2001
From: "zhangkun9038@dingtalk.com" <zhangkun9038@dingtalk.com>
Date: Sat, 10 Sep 2022 10:46:04 +0000
Subject: [PATCH] update
---
checkService.sh | 4 ++--
frontEndUpgrade.sh | 2 ++
ossUpgrade.sh | 6 +++---
3 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/checkService.sh b/checkService.sh
index cbf3c9d..ab7f015 100755
--- a/checkService.sh
+++ b/checkService.sh
@@ -77,12 +77,12 @@ function main(){
echo "result $result"
if [ $result = 0 ];then
# uploadLog
- echo "local temp file is same with oss file，no need to replace"
+ echo "local temp file ${fileName} is same with file in ${projectPath} ，no need to replace"
echo "ok: checkService done"
echo " "
exit 0
elif [ $result = 1 ]; then
- echo "local temp file $fileName is different from oss, will download..."
+ echo "local temp file $fileName is different from ${projectPath}, will replace..."
else
exit 0
fi
diff --git a/frontEndUpgrade.sh b/frontEndUpgrade.sh
index 0dde409..fc46e65 100755
--- a/frontEndUpgrade.sh
+++ b/frontEndUpgrade.sh
@@ -6,6 +6,8 @@ projectPath=$2
PATH=PATH:/usr/bin:/usr/sbin
echo "1"
projectName="${fileName%.*}"
+
+
cd ~
echo "current path: $(pwd)"
if [ ! -f "$fileName" ];then
diff --git a/ossUpgrade.sh b/ossUpgrade.sh
index 73deda3..8f734b9 100755
--- a/ossUpgrade.sh
+++ b/ossUpgrade.sh
@@ -37,9 +37,6 @@ function compare(){
fi
echo "ossLength ${fileName} : "$ossLength
echo "curLength ${fileName} : "$curLength
- logPath=${ossPath%/*}
- logPath=${logPath%/*}/logs/
- osslogPath=oss://ztupload/${logPath}autoDeploy.log
if [ "${ossLength}" = "${curLength}" ];then
return 0
else
@@ -55,6 +52,9 @@ function process(){
}
# function uploadLog(){
+ # logPath=${ossPath%/*}
+ # logPath=${logPath%/*}/logs/
+ # osslogPath=oss://ztupload/${logPath}autoDeploy.log
# journalctl -n 1000 -xe -t autoDeploy > ~/autoDeploy.log
# if [ $? = 0 ];then
# echo "uploaded log to ${osslogPath}"