👔 up(sys): rename a internal func and update some call name

gookit · Mar 16, 2023 · 17aeb31 · 17aeb31
1 parent 5221781
commit 17aeb31
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/internal/comfunc/sysfunc.go b/internal/comfunc/sysfunc.go
@@ -8,8 +8,8 @@ import (
 	"strings"
 )
 
-// ExpandPath will parse first `~` as user home dir path.
-func ExpandPath(pathStr string) string {
+// ExpandHome will parse first `~` as user home dir path.
+func ExpandHome(pathStr string) string {
 	if len(pathStr) == 0 {
 		return pathStr
 	}
@@ -26,7 +26,6 @@ func ExpandPath(pathStr string) string {
 	if err != nil {
 		return pathStr
 	}
-
 	return homeDir + pathStr[1:]
 }
 
@@ -106,6 +105,5 @@ func HasShellEnv(shell string) bool {
 	if err != nil {
 		return false
 	}
-
 	return strings.TrimSpace(out) == "OK"
 }
diff --git a/sysutil/user.go b/sysutil/user.go
@@ -76,6 +76,7 @@ func UserConfigDir(subPath string) string {
 }
 
 // ExpandPath will parse `~` as user home dir path.
-func ExpandPath(path string) string {
-	return comfunc.ExpandPath(path)
-}
+func ExpandPath(path string) string { return comfunc.ExpandHome(path) }
+
+// ExpandHome will parse `~` as user home dir path.
+func ExpandHome(path string) string { return comfunc.ExpandHome(path) }
diff --git a/sysutil/user_test.go b/sysutil/user_test.go
@@ -34,6 +34,7 @@ func TestUserDir(t *testing.T) {
 
 	rawPath := "~/.kite"
 	assert.LenGt(t, sysutil.ExpandPath(rawPath), len(rawPath))
+	assert.Neq(t, rawPath, sysutil.ExpandHome(rawPath))
 }
 
 func TestWorkdir(t *testing.T) {