From 9ec93868542b97e8b6fb23b5e35fa21ea8607e2e Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期五, 20 十二月 2019 14:42:29 +0800
Subject: [PATCH] update updatePatch.sh
---
service/SysService.go | 14 ++++++--------
1 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/service/SysService.go b/service/SysService.go
index b2acfb7..4e57f6b 100644
--- a/service/SysService.go
+++ b/service/SysService.go
@@ -208,9 +208,9 @@
if !util.CreateDirectory(configBakPath) {
return false
}
- b, err := ExecCmd("cp /opt/vasystem/bin /opt/vasystem/bak")
- logger.Debug("bakBeforeUpgrade result:",string(b))
+ b, err := ExecCmd("cp -r /opt/vasystem/bin /opt/vasystem/bak")
if err != nil {
+ logger.Debug("bakBeforeUpgrade result:",string(b),"err:",err)
return false
}
return true
@@ -247,16 +247,14 @@
updateCmd := fmt.Sprintf("./updatePatch.sh %s %s %s &",unZipPath,zipFilePath,configPatchPath+"/"+identifier)
if util.Exists(unZipPath+"upgrade.sh") {
updateCmd = fmt.Sprintf("%supgrade.sh %s %s %s &",unZipPath,unZipPath,zipFilePath,configPatchPath+"/"+identifier)
- logger.Debug("upgrade use ",unZipPath,"upgrade.sh")
}
//2.鏇存柊绯荤粺
- var cmd *exec.Cmd
- cmd = exec.Command("/bin/sh","-c", updateCmd)
- if b, err := cmd.Output(); err != nil {
- logger.Debug("updatePatch err:",err,"result:",string(b))
+ b,err := ExecCmd(updateCmd)
+ if err != nil {
+ logger.Debug("upgrade err:",err,"result:",string(b),"cmd:",updateCmd)
return false
} else {
- logger.Debug("updatePatch result:",string(b),"cmd:",updateCmd)
+ logger.Debug("upgrade result:",string(b),"cmd:",updateCmd)
}
return true
}
--
Gitblit v1.8.0