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
---
service/SysService.go | 20 ++++++++++++--------
1 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/service/SysService.go b/service/SysService.go
index b4a6bc6..c50339f 100644
--- a/service/SysService.go
+++ b/service/SysService.go
@@ -171,13 +171,13 @@
return false,errors.New("鑾峰彇鍗囩骇鍘嬬缉鍖卪d5澶辫触")
}
if strMd5 == identifier {
- if util.ZipCheck(zipFilePath + ext) {
+ if util.ZipCheck(zipFilePath) {
if !updatePatch(identifier, ext) {
return false,errors.New("鎵ц鍗囩骇杩囩▼寮傚父")
}
return true,nil
} else {
- logger.Debug("not a valid zip file,path:",zipFilePath+ext)
+ logger.Debug("not a valid zip file,path:",zipFilePath)
return false,errors.New("鍗囩骇绋嬪簭瑙ｅ帇澶辫触锛岃纭畾涓婁紶鐨勮ˉ涓佹槸zip鏍煎紡")
}
} else {
@@ -201,20 +201,24 @@
unZipPath := configPatchPath+"/"+identifier+"_basic/"
if util.Exists(unZipPath) {
//姝ょ増鏈凡缁忔洿鏂拌繃
- return true
- } else {
- if !util.CreateDirectory(unZipPath) {
+ rmErr := os.RemoveAll(unZipPath)
+ if rmErr !=nil {
return false
}
}
- err := util.UnZip(configPatchPath+"/"+identifier+ext, unZipPath)
+ if !util.CreateDirectory(unZipPath) {
+ return false
+ }
+
+ zipFilePath := configPatchPath+"/"+identifier+ext
+ err := util.UnZip(zipFilePath, unZipPath)
if err !=nil {
- logger.Debug("UnZip err:",err,"zipFile:",configPatchPath+"/"+identifier+ext)
+ logger.Debug("UnZip err:",err,"zipFile:",zipFilePath)
return false
}
//2.鏇存柊绯荤粺
var cmd *exec.Cmd
- updateCmd := fmt.Sprintf("setsid ./updatePatch.sh %s %s %s",unZipPath,configPatchPath+"/"+identifier+ext,configPatchPath+"/"+identifier)
+ updateCmd := fmt.Sprintf("./updatePatch.sh %s %s %s &",unZipPath,zipFilePath,configPatchPath+"/"+identifier)
cmd = exec.Command("/bin/sh","-c", updateCmd)
if b, err := cmd.Output(); err != nil {
logger.Debug("updatePatch err:",err,"result:",string(b))
--
Gitblit v1.8.0