From 181aab6a05b8fc62ff6aceade3ae364c57bc21a7 Mon Sep 17 00:00:00 2001
From: "zhangkun9038@dingtalk.com" <zhangkun9038@dingtalk.com>
Date: Fri, 3 Mar 2023 10:11:34 +0800
Subject: [PATCH] upstream_info and md5 sum file logic update

---
 checkService.sh    |  8 ++++----
 frontEndUpgrade.sh |  6 +++---
 ossUpgrade.sh      | 22 +++++++++++-----------
 3 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/checkService.sh b/checkService.sh
index 6aa79ce..9feadab 100755
--- a/checkService.sh
+++ b/checkService.sh
@@ -71,7 +71,7 @@ function compare(){
     #journalctl -n 1000 -xe -t autoDeploy > ${workPath}/autoDeploy.log
    return 0
   else 
-   echo $oriSum > ${workPath}/${preName}_md5.txt
+   echo $oriSum > ${workPath}/${fileName}_md5.txt
    return 1
   fi
 }
@@ -85,13 +85,13 @@ function restart(){
     exit 0
   fi
   echo "ok: systemctl restart ${serviceName} success!"
-  ossInfoTempPath=${workPath}/${preName}_oss.info
-  ossInfoProjectPath=${projectPath}/${preName}_oss.info
+  ossInfoTempPath=${workPath}/${fileName}_oss.info
+  ossInfoProjectPath=${projectPath}/${fileName}_oss.info
   echo ossInfoTempPath: $ossInfoTempPath
   echo ossInfoProjectPath: $ossInfoProjectPath
   rm -f ${ossInfoProjectPath}
   cp ${ossInfoTempPath} ${projectPath} 
-  cp ${workPath}/${preName}_md5.txt ${projectPath}
+  cp ${workPath}/${fileName}_md5.txt ${projectPath}
 
 }
 
diff --git a/frontEndUpgrade.sh b/frontEndUpgrade.sh
index c2bbdd7..0bd99ad 100755
--- a/frontEndUpgrade.sh
+++ b/frontEndUpgrade.sh
@@ -49,11 +49,11 @@ function extractHere() {
   echo "user: $user"
   chgrp $user $projectName -R
   chown $user $projectName -R
-  cp ${workPath}/${preName}_oss.info $projectName
+  cp ${workPath}/${fileName}_oss.info $projectName
   sleep 5
   md5Sum=$(md5sum $fileName)
   md5Sum="${md5Sum%  *}"
-  echo ${md5Sum} > ${projectName}/${preName}_md5.txt 
+  echo ${md5Sum} > ${projectName}/${fileName}_md5.txt 
 }
 
 function init(){
@@ -124,7 +124,7 @@ function replaceFile(){
 function verify() {
   cd /tmp/autoDeploy
   cd $projectPath/${preName}
-  echo "the md5sum injected in ${projectPath}/${preName} is $(cat ${preName}_md5.txt)"
+  echo "the md5sum injected in ${projectPath}/${preName} is $(cat ${fileName}_md5.txt)"
 }
 
 function main() {
diff --git a/ossUpgrade.sh b/ossUpgrade.sh
index 55f2f56..f8a100a 100755
--- a/ossUpgrade.sh
+++ b/ossUpgrade.sh
@@ -5,7 +5,7 @@
 PATH=PATH:/usr/bin:/usr/sbin:/usr/local/bin
 ossPath=$1 #末尾别忘了加/
 fileName=$2
-projectName="${fileName%.*}"
+preName="${fileName%.*}"
 
 basePath=/tmp/autoDeploy
 if [ -n $3 ]; then
@@ -17,21 +17,21 @@ fi
 
 function compare(){
   cd $basePath
-  if [ ! -f ${projectName}_oss.info ]; then
-    touch ${projectName}_oss.info
+  if [ ! -f ${fileName}_oss.info ]; then
+    touch ${fileName}_oss.info
   fi
   echo upstream ossPath: oss://${ossPath}$fileName
-  ( ossutil stat oss://${ossPath}$fileName | head -n -2) > ${projectName}_upstream_oss.info
-  upstreamOssInfoMd5=$(md5sum ${projectName}_upstream_oss.info)
+  ( ossutil stat oss://${ossPath}$fileName | head -n -2) > ${fileName}_upstream_oss.info
+  upstreamOssInfoMd5=$(md5sum ${fileName}_upstream_oss.info)
   upstreamOssInfoMd5="${upstreamOssInfoMd5%  *}"
-  locOssInfoMd5=$(md5sum ${projectName}_oss.info)
+  locOssInfoMd5=$(md5sum ${fileName}_oss.info)
   locOssInfoMd5="${locOssInfoMd5%  *}"
   echo "upstream $fileName ossInfo md5: |${upstreamOssInfoMd5}|"
   echo "localTep $fileName ossInfo md5: |${locOssInfoMd5}|"
-  echo "upstream:" $(pwd)/${projectName}_upstream_oss.info
-  cat ${projectName}_upstream_oss.info
-  echo "localTem:" $(pwd)/${projectName}_oss.info
-  cat ${projectName}_oss.info
+  echo "upstream:" $(pwd)/${fileName}_upstream_oss.info
+  cat ${fileName}_upstream_oss.info
+  echo "localTem:" $(pwd)/${fileName}_oss.info
+  cat ${fileName}_oss.info
   if [ "${upstreamOssInfoMd5}" = "${locOssInfoMd5}" ];then
     return 0
   else 
@@ -45,7 +45,7 @@ function downloadFromOss(){
   ossutil cp -f oss://${ossPath}${fileName} ${fileName}_tmp
   rm $fileName
   mv ${fileName}_tmp $fileName
-  ( ossutil stat oss://${ossPath}$fileName | head -n -2) > ${projectName}_oss.info
+  ( ossutil stat oss://${ossPath}$fileName | head -n -2) > ${fileName}_oss.info
 }
 
 function main(){