From de78551fa11a996aeca98ce48092aae37c7cd725 Mon Sep 17 00:00:00 2001
From: TsMask <340112800@qq.com>
Date: Tue, 4 Jun 2024 16:05:37 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E7=BD=91=E5=85=83=E7=89=88=E6=9C=AC?=
 =?UTF-8?q?=E5=AE=89=E8=A3=85OMC=E5=8D=87=E7=BA=A7=E5=9B=9E=E6=BB=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../network_element/service/ne_version.impl.go | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/modules/network_element/service/ne_version.impl.go b/src/modules/network_element/service/ne_version.impl.go
index 53e085c4..aa211ac1 100644
--- a/src/modules/network_element/service/ne_version.impl.go
+++ b/src/modules/network_element/service/ne_version.impl.go
@@ -199,15 +199,21 @@ func (r *NeVersionImpl) operateCommand(action, neType string, neFilePaths []stri
 	// 组合命令输入
 	cmdStrArr := []string{}
 	if neType == "OMC" {
-		cmdStrArr = append(cmdStrArr, pkgCmdStr+" \n")
-		if action == "install" {
-			cmdStrArr = append(cmdStrArr, "sudo /usr/local/omc/bin/setomc.sh -m install \n") // 初始化数据库
+		omcStrArr := []string{}
+		omcStrArr = append(omcStrArr, pkgCmdStr)
+		if action == "install" || action == "rollback" {
+			omcStrArr = append(omcStrArr, "sudo /usr/local/omc/bin/setomc.sh -m install") // 初始化数据库
 		} else {
-			cmdStrArr = append(cmdStrArr, "sudo /usr/local/omc/bin/setomc.sh -m upgrade \n") // 升级数据库
+			omcStrArr = append(omcStrArr, "sudo /usr/local/omc/bin/setomc.sh -m upgrade") // 升级数据库
 		}
+		omcStrArr = append(omcStrArr, "sudo systemctl restart restagent")                        // 重启服务
+		omcStrArr = append(omcStrArr, fmt.Sprintf("sudo rm %s", strings.Join(neFilePaths, " "))) // 删除软件包
 
-		// 2s后重启服务
-		cmdStrArr = append(cmdStrArr, "nohup sh -c \"sleep 2s && sudo systemctl restart restagent\" > /dev/null 2>&1 & \n")
+		// 2s后安装
+		cmdStrArr = append(cmdStrArr, fmt.Sprintf("nohup sh -c \"sleep 2s && %s\" > /dev/null 2>&1 & \n", strings.Join(omcStrArr, " && ")))
+		// 结束
+		cmdStrArr = append(cmdStrArr, fmt.Sprintf("echo '%s' \n", okFlagStr))
+		return okFlagStr, cmdStrArr, nil
 	} else if neType == "IMS" {
 		if action == "install" {
 			para5GData := NewNeInfoImpl.Para5GData