U: energy cli

energye · Dec 17, 2024 · 49d06cb · 49d06cb
1 parent 095ef7a
commit 49d06cb
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 25 deletions.
diff --git a/cmd/internal/env/energy.go b/cmd/internal/env/energy.go
@@ -132,9 +132,9 @@ func (m *EnergyConfig) GoCMD() string {
 }
 
 func (m *EnergyConfig) NSISCMD() string {
-	if tools.CommandExists("makensis") {
-		return "makensis"
-	}
+	//if tools.CommandExists("makensis") {
+	//	return "makensis"
+	//}
 	nsis := filepath.Join(m.NSIS, "makensis")
 	if tools.IsExist(nsis) {
 		return nsis
@@ -143,12 +143,12 @@ func (m *EnergyConfig) NSISCMD() string {
 }
 
 func (m *EnergyConfig) Z7ZCMD() string {
-	if tools.CommandExists("7z") {
-		return "7z"
-	}
-	if tools.CommandExists("7za") {
-		return "7za"
-	}
+	//if tools.CommandExists("7z") {
+	//	return "7z"
+	//}
+	//if tools.CommandExists("7za") {
+	//	return "7za"
+	//}
 	z7z := filepath.Join(m.Z7Z, "7z")
 	if tools.IsExist(z7z) {
 		return z7z
@@ -165,9 +165,9 @@ func (m *EnergyConfig) Z7ZCMD() string {
 }
 
 func (m *EnergyConfig) UPXCMD() string {
-	if tools.CommandExists("upx") {
-		return "upx"
-	}
+	//if tools.CommandExists("upx") {
+	//	return "upx"
+	//}
 	upx := filepath.Join(m.UPX, "upx")
 	if tools.IsExist(upx) {
 		return upx

diff --git a/cmd/internal/install/install.go b/cmd/internal/install/install.go
@@ -272,7 +272,7 @@ func upxInstallPathName(c *command.Config) string {
 }
 
 func z7zInstallPathName(c *command.Config) string {
-	return filepath.Join(c.Install.Path, consts.ENERGY, "7za")
+	return filepath.Join(c.Install.Path, consts.ENERGY, "7z")
 }
 
 func nsisCanInstall() bool {
@@ -316,8 +316,9 @@ func checkLocalInstallEnv(config *remotecfg.TConfig, cmdConfig *command.Config)
 	}, "CEF Framework", func() {
 		cmdConfig.Install.ICEF = true //yes callback
 	})
+
+	// NSIS
 	if nsisCanInstall() {
-		// nsis
 		check(func() (string, bool) {
 			if nsisCanInstall() {
 				return "Windows", env.GlobalDevEnvConfig.NSISCMD() != ""
@@ -328,16 +329,11 @@ func checkLocalInstallEnv(config *remotecfg.TConfig, cmdConfig *command.Config)
 			cmdConfig.Install.INSIS = true //yes callback
 		})
 	}
+
+	// upx
 	if upxCanInstall() {
-		// upx
 		check(func() (string, bool) {
 			if upxCanInstall() {
-				if consts.IsDarwin {
-					if tools.CommandExists("upx") {
-						return "All", true
-					}
-					return "Install: brew install upx", true
-				}
 				return "All", env.GlobalDevEnvConfig.UPXCMD() != ""
 			} else {
 				return "Unsupported platform UPX.", true
@@ -346,8 +342,9 @@ func checkLocalInstallEnv(config *remotecfg.TConfig, cmdConfig *command.Config)
 			cmdConfig.Install.IUPX = true //yes callback
 		})
 	}
+
+	// 7z
 	if z7zCanInstall() {
-		// 7za
 		check(func() (string, bool) {
 			if z7zCanInstall() {
 				return "Windows", env.GlobalDevEnvConfig.Z7ZCMD() != ""
@@ -358,11 +355,15 @@ func checkLocalInstallEnv(config *remotecfg.TConfig, cmdConfig *command.Config)
 			cmdConfig.Install.I7za = true //yes callback
 		})
 	}
+
+	// linux
 	if consts.IsLinux {
 		// gtk2
 		// gtk3
 		// dpkg
 	}
+
+	// macos
 	if consts.IsDarwin {
 		//
 	}

diff --git a/cmd/internal/install/install_nsis.go b/cmd/internal/install/install_nsis.go
@@ -46,9 +46,8 @@ func installNSIS(config *remotecfg.TConfig, cmdConfig *command.Config) (string,
 		}
 	}
 	if err == nil {
-		// 安装目录
-		// 释放文件
-		//zip
+		// 安装目录 释放文件
+		// zip
 		if err = tools.ExtractUnZip(savePath, installPath, true); err != nil {
 			term.Logger.Error(err.Error())
 			return "", nil