energy-command-line, 优化命令 install .

cmd/internal/env/env_windows.go

@@ -22,8 +22,6 @@ import (
 	"strings"
 )
 
-var envkeys = make(map[string]string)
-
 func SetNSISEnv(nsisRoot string) {
 	makensis := filepath.Join(nsisRoot, "makensis.exe")
 	if !tools.IsExist(makensis) {
@@ -78,7 +76,6 @@ func SetEnergyHomeEnv(homePath string) {
 }
 
 func setWindowsEnv(name, value string) {
-	envkeys[name] = value
 	cmd := toolsCommand.NewCMD()
 	cmd.IsPrint = false
 	cmd.Command("setx", name, value)

cmd/internal/install/install.go

@@ -83,7 +83,7 @@ func Install(c *command.Config) {
 	}
 	// success 输出
 	if nsisSuccessCallback != nil || goSuccessCallback != nil || cefFrameworkSuccessCallback != nil {
-		println("-----------------------------------------------------")
+		println("-----------------------------------------------------\n-----------------------------------------------------")
 	}
 	if nsisSuccessCallback != nil {
 		nsisSuccessCallback()
@@ -148,7 +148,7 @@ func checkInstallEnv(c *command.Config) (result []string) {
 	})
 	// nsis
 	check(func() bool {
-		if consts.IsWindows && runtime.GOARCH == "amd64" {
+		if consts.IsWindows && runtime.GOARCH != "arm64" {
 			return tools.CommandExists("makensis")
 		} else {
 			println("  Non Windows amd64 skipping NSIS")

cmd/internal/install/install_cef_framework.go

@@ -319,7 +319,7 @@ func liblclName(version, cef string) (string, bool) {
 				key = fmt.Sprintf("%sarm64", runtime.GOOS)
 			}
 		}
-	} else if runtime.GOARCH == "amd64" {
+	} else {
 		if consts.IsLinux && cef == consts.Cef106 { // 只linux区别liblcl gtk2
 			key = "linux64gtk2"
 		} else {
@@ -343,7 +343,13 @@ func liblclName(version, cef string) (string, bool) {
 //  GTK2: 非必需, GTK2(Linux CEF 106) 时填写, 非Linux或GTK3时为空
 func liblclOS(cef, version, buildSupportOSArch string) (string, bool) {
 	archs := strings.Split(buildSupportOSArch, ",")
-	noSuport := fmt.Sprintf("%v %v", runtime.GOOS, runtime.GOARCH)
+	var goarch string
+	if consts.IsWindows && runtime.GOARCH == "386" {
+		goarch = "32" // windows32 = > windows386
+	} else {
+		goarch = runtime.GOARCH
+	}
+	noSuport := fmt.Sprintf("%v %v", runtime.GOOS, goarch)
 	var isSupport = func(goarch string) bool {
 		for _, v := range archs {
 			if goarch == v {

cmd/internal/install/install_nsis.go

@@ -23,7 +23,7 @@ func installNSIS(c *command.Config) (string, func()) {
 	if !c.Install.INSIS {
 		return "", nil
 	}
-	if consts.IsWindows && runtime.GOARCH == "amd64" {
+	if consts.IsWindows && runtime.GOARCH != "arm64" {
 		// 下载并安装配置NSIS
 		s := c.Install.Path // 安装目录
 		version := consts.NSISDownloadVersion