fix: tool version config

Author: iseki0

module/maven/mvn_cmd_utils.go

@@ -91,6 +91,7 @@ func CheckMvnCommand(ctx context.Context, isNoBuild bool) (info *MvnCommandInfo,
 	info.Path = toolVer.Maven.MavenCommand
 	if info.Path == "" {
 		info.Path = getMvnCommandOs()
+		logger.Sugar().Infof("Use system mvn command: %s", info.Path)
 	}
 	if info.Path == "" {
 		return nil, ErrMvnNotFound

toolver/env.go

@@ -7,17 +7,16 @@ import (
 )
 
 var envOnce sync.Once
-var envConfig *Config
+var envConfig Config
 
 func getFromEnv() *Config {
 	envOnce.Do(func() {
 		var s = os.Getenv("AUTO_BUILD_TOOLCHAIN_CONFIG")
 		if s != "" {
-			var o Config
-			if json.Unmarshal([]byte(s), &o) != nil {
-				envConfig = &o
+			if e := json.Unmarshal([]byte(s), &envConfig); e != nil {
+				panic(e)
 			}
 		}
 	})
-	return envConfig
+	return &envConfig
 }

toolver/get.go

@@ -9,7 +9,11 @@ var Default Config
 var postprocessors []func(context.Context, *Config)
 
 func Get(ctx context.Context) *Config {
-	return mergeConfig(mergeConfig(&Default, getIntellijConfig()), getFromEnv())
+	var r = mergeConfig(mergeConfig(&Default, getIntellijConfig()), getFromEnv())
+	for _, it := range postprocessors {
+		it(ctx, r)
+	}
+	return r
 }
 
 func mergeConfig(old *Config, new *Config) *Config {

toolver/scae_predefined_config.go

@@ -2,8 +2,6 @@ package toolver
 
 import (
 	"context"
-
-	"github.com/murphysecurity/murphysec/utils"
 )
 
 func init() {
@@ -29,7 +27,7 @@ func locateJavaHome(version string) string {
 	case "jdk21":
 		javaHome = "/opt/java/21"
 	}
-	if javaHome != "" && utils.IsDirResolveSymlink(javaHome) {
+	if javaHome != "" {
 		return javaHome
 	}
 	return ""
@@ -45,7 +43,7 @@ func locateMvnHome(version string) string {
 	case "maven3.9.5":
 		mvnHome = "/opt/maven/3.9.5"
 	}
-	if mvnHome != "" && utils.IsDirResolveSymlink(mvnHome) {
+	if mvnHome != "" {
 		return mvnHome
 	}
 	return ""