From 207ebeb394236a065757309de0f25129d0d503d8 Mon Sep 17 00:00:00 2001
From: KK <68334452+healthjyk@users.noreply.github.com>
Date: Fri, 22 Dec 2023 15:22:42 +0800
Subject: [PATCH] fix: misuse of env KUSION_PATH (#716)

---
 Dockerfile                  | 3 ++-
 Dockerfile_kusionctl        | 3 ++-
 pkg/util/kfile/file.go      | 4 ++--
 pkg/util/kfile/file_test.go | 2 +-
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 645108d1..422e28ac 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -9,7 +9,8 @@ RUN apt-get update -y && apt-get install python3 python3-pip -y
 # KCL PATH
 ENV PATH="/root/go/bin:${PATH}"
 # KUSION_PATH
-ENV KUSION_PATH="$HOME/.kusion"
+ENV KUSION_HOME="$HOME/.kusion"
+ENV KUSION_PATH="$KUSION_HOME/bin"
 ENV LANG=en_US.utf8
 
 FROM base AS goreleaser
diff --git a/Dockerfile_kusionctl b/Dockerfile_kusionctl
index df677983..1683e171 100644
--- a/Dockerfile_kusionctl
+++ b/Dockerfile_kusionctl
@@ -5,5 +5,6 @@ COPY _build/bundles/kusion-linux/bin/kusion /kusion/bin/
 RUN chmod +x /kusion/bin/kusion
 
 ENV PATH="/kusion/bin:${PATH}"
-ENV KUSION_PATH="/kusion"
+ENV KUSION_HOME="/kusion"
+ENV KUSION_PATH="$KUSION_HOME/bin"
 ENV LANG=en_US.utf8
diff --git a/pkg/util/kfile/file.go b/pkg/util/kfile/file.go
index b84a5acd..cb1423fd 100644
--- a/pkg/util/kfile/file.go
+++ b/pkg/util/kfile/file.go
@@ -10,7 +10,7 @@ import (
 )
 
 const (
-	EnvKusionPath = "KUSION_PATH"
+	EnvKusionHome = "KUSION_HOME"
 	// CachedVersionFile is the name of the file we use to store when we last checked if the CLI was out of date
 	CachedVersionFile = ".cached_version"
 )
@@ -62,7 +62,7 @@ func FileExists(filename string) (bool, error) {
 func KusionDataFolder() (string, error) {
 	var kusionDataFolder string
 
-	if kusionPath := os.Getenv(EnvKusionPath); kusionPath != "" {
+	if kusionPath := os.Getenv(EnvKusionHome); kusionPath != "" {
 		kusionDataFolder = kusionPath
 	} else {
 		usr, err := user.Current()
diff --git a/pkg/util/kfile/file_test.go b/pkg/util/kfile/file_test.go
index be5f992e..3a46d6ca 100644
--- a/pkg/util/kfile/file_test.go
+++ b/pkg/util/kfile/file_test.go
@@ -72,7 +72,7 @@ func TestKusionDataFolder(t *testing.T) {
 	for _, tt := range tests {
 		mockey.PatchConvey(tt.name, t, func() {
 			// Mock data
-			os.Setenv(EnvKusionPath, "")
+			os.Setenv(EnvKusionHome, "")
 			mockUserCurrent()
 			mockMkdirall()
 			got, err := KusionDataFolder()