upstream_info and md5 sum file logic update
This commit is contained in:
parent
351f58aca6
commit
181aab6a05
@ -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}
|
||||
|
||||
}
|
||||
|
||||
|
@ -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() {
|
||||
|
@ -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(){
|
||||
|
Loading…
x
Reference in New Issue
Block a user