From e6725b2a0eb883d695dfdb27446a1300f4202804 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E7=BA=A2=E5=B2=A9?= <snxamdf@126.com>
Date: Wed, 6 Sep 2023 21:04:45 +0800
Subject: [PATCH] =?UTF-8?q?energy-command-line,=20=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E5=91=BD=E4=BB=A4=20install=20.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 cmd/internal/env/env_posix.go         | 4 ++--
 cmd/internal/env/env_windows.go       | 3 +++
 cmd/internal/init.go                  | 6 +++---
 cmd/internal/initialize/initialize.go | 2 +-
 4 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/cmd/internal/env/env_posix.go b/cmd/internal/env/env_posix.go
index 0aa58e6..9dd44d2 100644
--- a/cmd/internal/env/env_posix.go
+++ b/cmd/internal/env/env_posix.go
@@ -55,10 +55,10 @@ func SetGoEnv(goRoot string) {
 	//export GOBIN=$GOROOT/bin
 	//export PATH=$PATH:$GOBIN
 	var exGoRoot = fmt.Sprintf("export GOROOT=%s", goRoot)
-	//var exGoCache = "export GOCACHE==$GOROOT/gocache"
+	var exGoCache = "export GOCACHE=$GOROOT/go-build"
 	var exGoBin = "export GOBIN=$GOROOT/bin"
 	var exPath = "export PATH=$PATH:$GOBIN"
-	var exs = []string{exGoRoot /*exGoCache,*/, exGoBin}
+	var exs = []string{exGoRoot, exGoCache, exGoBin}
 	setPosixEnv(exs, exPath, "$GOBIN")
 	println("\nHint: Reopen the cmd window for the Go command to take effect.")
 }
diff --git a/cmd/internal/env/env_windows.go b/cmd/internal/env/env_windows.go
index 6ab856e..456f520 100644
--- a/cmd/internal/env/env_windows.go
+++ b/cmd/internal/env/env_windows.go
@@ -93,6 +93,9 @@ func appendWindowsEnv(name, value string) {
 				values := strings.Split(val, "\\")
 				for i, vab := range values {
 					vab = strings.TrimSpace(vab)
+					if vab == "" || len(vab) <= 2 {
+						continue
+					}
 					if vab[0] == '%' && vab[len(vab)-1] == '%' {
 						vab = vab[1 : len(vab)-1]
 						if v, err := regCurUser.Read(vab); err == nil {
diff --git a/cmd/internal/init.go b/cmd/internal/init.go
index 45af8f5..166b2f9 100644
--- a/cmd/internal/init.go
+++ b/cmd/internal/init.go
@@ -21,9 +21,9 @@ import (
 
 var CmdInit = &command.Command{
 	UsageLine: "init -n [name]",
-	Short:     "init energy project",
+	Short:     "Initialized energy project",
 	Long: `
-	-n initialized project name
+	-n Initialized project name
 	Initialize energy golang project
 	.  Execute default command
 `,
@@ -44,7 +44,7 @@ func runInit(c *command.Config) error {
 	}
 	if strings.TrimSpace(m.ResLoad) == "" {
 		println("Resource loading method, default 1 HTTP")
-		print("1: HTTP, 2: Local Load, Number: ")
+		print("1: HTTP\n2: Local Load\n  Number: ")
 		fmt.Scan(&m.ResLoad)
 		println()
 	}
diff --git a/cmd/internal/initialize/initialize.go b/cmd/internal/initialize/initialize.go
index 67392d3..98f01b6 100644
--- a/cmd/internal/initialize/initialize.go
+++ b/cmd/internal/initialize/initialize.go
@@ -53,7 +53,7 @@ func generaProject(c *command.Config) error {
 	projectPath := filepath.Join(c.Wd, c.Init.Name)
 	println("Create Project:", c.Init.Name)
 	if tools.IsExist(projectPath) {
-		fmt.Printf("project dir %s exist, Do you want to delete and recreate? Y/n:  ", c.Init.Name)
+		fmt.Printf("project dir %s exist, Delete and recreate? (Y/n):  ", c.Init.Name)
 		var s string
 		fmt.Scan(&s)
 		println()
-- 
GitLab