✨ feat: env,sys - add new func for get all env info map

envutil/get.go

@@ -2,6 +2,7 @@ package envutil
 
 import (
 	"os"
+	"path/filepath"
 
 	"github.com/gookit/goutil/internal/comfunc"
 	"github.com/gookit/goutil/strutil"
@@ -40,7 +41,32 @@ func GetBool(name string, def ...bool) bool {
 	return false
 }
 
+// EnvPaths get and split $PATH to []string
+func EnvPaths() []string {
+	return filepath.SplitList(os.Getenv("PATH"))
+}
+
 // Environ like os.Environ, but will returns key-value map[string]string data.
 func Environ() map[string]string {
 	return comfunc.Environ()
 }
+
+// SearchEnvKeys values by given keywords
+func SearchEnvKeys(keywords string) map[string]string {
+	return SearchEnv(keywords, false)
+}
+
+// SearchEnv values by given keywords
+func SearchEnv(keywords string, matchValue bool) map[string]string {
+	founded := make(map[string]string)
+
+	for name, val := range comfunc.Environ() {
+		if strutil.IContains(name, keywords) {
+			founded[name] = val
+		} else if matchValue && strutil.IContains(val, keywords) {
+			founded[name] = val
+		}
+	}
+
+	return founded
+}

envutil/get_test.go

@@ -42,6 +42,8 @@ func TestGetBool(t *testing.T) {
 }
 
 func TestEnviron(t *testing.T) {
+	assert.NotEmpty(t, EnvPaths())
+
 	testutil.MockOsEnv(map[string]string{
 		TestEnvName: TestEnvValue,
 	}, func() {

sysutil/sysenv.go

@@ -118,6 +118,11 @@ func HasExecutable(binName string) bool {
 	return err == nil
 }
 
+// Environ like os.Environ, but will returns key-value map[string]string data.
+func Environ() map[string]string {
+	return comfunc.Environ()
+}
+
 // EnvPaths get and split $PATH to []string
 func EnvPaths() []string {
 	return filepath.SplitList(os.Getenv("PATH"))

sysutil/sysenv_test.go

@@ -14,6 +14,8 @@ func TestSysenv_common(t *testing.T) {
 	ss := sysutil.EnvPaths()
 	assert.NotEmpty(t, ss)
 
+	assert.NotEmpty(t, sysutil.Environ())
+
 	ss = sysutil.SearchPath("go")
 	assert.NotEmpty(t, ss)
 	// dump.P(ss)

sysutil/user.go

@@ -46,11 +46,9 @@ var homeDir string
 
 // UserHomeDir is alias of os.UserHomeDir, but ignore error
 func UserHomeDir() string {
-	if homeDir != "" {
-		return homeDir
+	if homeDir == "" {
+		homeDir, _ = os.UserHomeDir()
 	}
-
-	homeDir, _ = os.UserHomeDir()
 	return homeDir
 }