From d13cf6096f2dc09945e74a75efe3698fcfdc4629 Mon Sep 17 00:00:00 2001
From: aaron <462826@qq.com>
Date: Thu, 21 Apr 2022 10:13:18 +0800
Subject: [PATCH] fix a bug about submit result to zentao

---
 Makefile                              | 26 +++++++++++++-------------
 internal/comm/helper/zentao/result.go |  3 ++-
 makefile-command.mk                   | 17 ++++++++---------
 3 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/Makefile b/Makefile
index 92222631..26262c73 100644
--- a/Makefile
+++ b/Makefile
@@ -17,7 +17,7 @@ default: win64 win32 linux mac
 win64: update_version prepare_res build_win64 copy_files_win64 zip_win64
 win32: update_version prepare_res build_win32 copy_files_win32 zip_win32
 linux: update_version prepare_res build_linux copy_files_linux zip_linux
-mac: update_version prepare_res build_mac copy_files_mac zip_mac
+mac: update_version prepare_res build_mac copy_files_darwin zip_darwin
 
 update_version: update_version_in_config gen_version_file
 
@@ -98,9 +98,9 @@ copy_files_linux:
 	@echo 'start copy files linux'
 	cp -r demo "${OUT_DIR}linux"
 
-copy_files_mac:
+copy_files_darwin:
 	@echo 'start copy files mac'
-	cp -r demo "${OUT_DIR}mac"
+	cp -r demo "${OUT_DIR}darwin"
 
 #copy_files:
 #	@echo 'start copy files'
@@ -110,7 +110,7 @@ copy_files_mac:
 zip_win64:
 	@echo 'start zip win64'
 	@find . -name .DS_Store -print0 | xargs -0 rm -f
-	@mkdir -p ${QINIU_DIST_DIR}win64
+	@mkdir -p ${QINIU_DIST_DIR}win64 && rm -rf ${QINIU_DIST_DIR}win64/${PROJECT}.zip
 	@cd ${OUT_DIR}win64 && \
 		zip -ry ${QINIU_DIST_DIR}win64/${PROJECT}.zip ./* && \
 		md5sum ${QINIU_DIST_DIR}win64/${PROJECT}.zip | awk '{print $$1}' | \
@@ -120,7 +120,7 @@ zip_win64:
 zip_win32:
 	@echo 'start zip win32'
 	@find . -name .DS_Store -print0 | xargs -0 rm -f
-	@mkdir -p ${QINIU_DIST_DIR}win32
+	@mkdir -p ${QINIU_DIST_DIR}win32 && rm -rf ${QINIU_DIST_DIR}win32/${PROJECT}.zip
 	@cd ${OUT_DIR}win32 && \
 		zip -ry ${QINIU_DIST_DIR}win32/${PROJECT}.zip ./* && \
 		md5sum ${QINIU_DIST_DIR}win32/${PROJECT}.zip | awk '{print $$1}' | \
@@ -130,21 +130,21 @@ zip_win32:
 zip_linux:
 	@echo 'start zip linux'
 	@find . -name .DS_Store -print0 | xargs -0 rm -f
-	@mkdir -p ${QINIU_DIST_DIR}linux
+	@mkdir -p ${QINIU_DIST_DIR}linux && rm -rf ${QINIU_DIST_DIR}linux/${PROJECT}.zip
 	@cd ${OUT_DIR}linux && \
 		zip -ry ${QINIU_DIST_DIR}linux/${PROJECT}.zip ./* && \
 		md5sum ${QINIU_DIST_DIR}linux/${PROJECT}.zip | awk '{print $$1}' | \
 			xargs echo > ${QINIU_DIST_DIR}linux/${PROJECT}.zip.md5 && \
         cd ../..; \
 
-zip_mac:
-	@echo 'start zip mac'
+zip_darwin:
+	@echo 'start zip darwin'
 	@find . -name .DS_Store -print0 | xargs -0 rm -f
-	@mkdir -p ${QINIU_DIST_DIR}mac
-	@cd ${OUT_DIR}mac && \
-		zip -ry ${QINIU_DIST_DIR}mac/${PROJECT}.zip ./* && \
-		md5sum ${QINIU_DIST_DIR}mac/${PROJECT}.zip | awk '{print $$1}' | \
-			xargs echo > ${QINIU_DIST_DIR}mac/${PROJECT}.zip.md5 && \
+	@mkdir -p ${QINIU_DIST_DIR}darwin && rm -rf ${QINIU_DIST_DIR}darwin/${PROJECT}.zip
+	@cd ${OUT_DIR}darwin && \
+		zip -ry ${QINIU_DIST_DIR}darwin/${PROJECT}.zip ./* && \
+		md5sum ${QINIU_DIST_DIR}darwin/${PROJECT}.zip | awk '{print $$1}' | \
+			xargs echo > ${QINIU_DIST_DIR}darwin/${PROJECT}.zip.md5 && \
         cd ../..; \
 
 #zip:
diff --git a/internal/comm/helper/zentao/result.go b/internal/comm/helper/zentao/result.go
index cfe6b0e3..90385dda 100644
--- a/internal/comm/helper/zentao/result.go
+++ b/internal/comm/helper/zentao/result.go
@@ -50,7 +50,8 @@ func CommitResult(report commDomain.ZtfReport, productId, taskId int, config com
 
 	logUtils.Info(msgColor)
 
-	if commConsts.ExecFrom != commConsts.FromCmd {
+	if commConsts.ExecFrom != commConsts.FromCmd &&
+		wsMsg != nil { // from executing, not submit in webpage
 		websocketHelper.SendExecMsg(msg, "", commConsts.Result, wsMsg)
 	}
 
diff --git a/makefile-command.mk b/makefile-command.mk
index 5cafede0..43851a2e 100644
--- a/makefile-command.mk
+++ b/makefile-command.mk
@@ -81,22 +81,21 @@ copy_files_mac:
 zip_win64:
 	@echo 'start zip win64'
 	@find . -name .DS_Store -print0 | xargs -0 rm -f
-	@mkdir -p ${QINIU_DIST_DIR}win64; done
+	@mkdir -p ${QINIU_DIST_DIR}win64 && rm -rf ${QINIU_DIST_DIR}win64/${PROJECT}-cmd.zip
 
 	@cd ${BIN_DIR}win64 && \
-	   zip -r ${QINIU_DIST_DIR}win64/${PROJECT}-cmd.zip ./* && \
+	   zip -ry ${QINIU_DIST_DIR}win64/${PROJECT}-cmd.zip ./* && \
 	   md5sum ${QINIU_DIST_DIR}win64/${PROJECT}-cmd.zip | awk '{print $$1}' | \
 			  xargs echo > ${QINIU_DIST_DIR}win64/${PROJECT}-cmd.zip.md5 && \
 		cd ../..; \
 
-
 zip_win32:
 	@echo 'start zip win32'
 	@find . -name .DS_Store -print0 | xargs -0 rm -f
-	@mkdir -p ${QINIU_DIST_DIR}win32; done
+	@mkdir -p ${QINIU_DIST_DIR}win32 && rm -rf ${QINIU_DIST_DIR}win32/${PROJECT}-cmd.zip
 
 	@cd ${BIN_DIR}win32 && \
-	   zip -r ${QINIU_DIST_DIR}win32/${PROJECT}-cmd.zip ./* && \
+	   zip -ry ${QINIU_DIST_DIR}win32/${PROJECT}-cmd.zip ./* && \
 	   md5sum ${QINIU_DIST_DIR}win32/${PROJECT}-cmd.zip | awk '{print $$1}' | \
 			  xargs echo > ${QINIU_DIST_DIR}win32/${PROJECT}-cmd.zip.md5 && \
 		cd ../..; \
@@ -104,10 +103,10 @@ zip_win32:
 zip_linux:
 	@echo 'start zip linux'
 	@find . -name .DS_Store -print0 | xargs -0 rm -f
-	@mkdir -p ${QINIU_DIST_DIR}linux; done
+	@mkdir -p ${QINIU_DIST_DIR}linux && rm -rf ${QINIU_DIST_DIR}linux/${PROJECT}-cmd.zip
 
 	@cd ${BIN_DIR}linux && \
-	   zip -r ${QINIU_DIST_DIR}linux/${PROJECT}-cmd.zip ./* && \
+	   zip -ry ${QINIU_DIST_DIR}linux/${PROJECT}-cmd.zip ./* && \
 	   md5sum ${QINIU_DIST_DIR}linux/${PROJECT}-cmd.zip | awk '{print $$1}' | \
 			  xargs echo > ${QINIU_DIST_DIR}linux/${PROJECT}-cmd.zip.md5 && \
 		cd ../..; \
@@ -115,10 +114,10 @@ zip_linux:
 zip_mac:
 	@echo 'start zip mac'
 	@find . -name .DS_Store -print0 | xargs -0 rm -f
-	@mkdir -p ${QINIU_DIST_DIR}mac; done
+	@mkdir -p ${QINIU_DIST_DIR}mac && rm -rf ${QINIU_DIST_DIR}mac/${PROJECT}-cmd.zip
 
 	@cd ${BIN_DIR}mac && \
-	   zip -r ${QINIU_DIST_DIR}mac/${PROJECT}-cmd.zip ./* && \
+	   zip -ry ${QINIU_DIST_DIR}mac/${PROJECT}-cmd.zip ./* && \
 	   md5sum ${QINIU_DIST_DIR}mac/${PROJECT}-cmd.zip | awk '{print $$1}' | \
 			  xargs echo > ${QINIU_DIST_DIR}mac/${PROJECT}-cmd.zip.md5 && \
 		cd ../..; \
-- 
GitLab