From 028fd11ab5964b0c106a0ae8cc9f634448ffba87 Mon Sep 17 00:00:00 2001 From: Boming Zhang Date: Tue, 29 Oct 2024 05:43:40 -0400 Subject: [PATCH] refactor(cmd/joj3): use filepath.Join --- cmd/joj3/conf/conf.go | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/cmd/joj3/conf/conf.go b/cmd/joj3/conf/conf.go index e369d7b..fc92c69 100644 --- a/cmd/joj3/conf/conf.go +++ b/cmd/joj3/conf/conf.go @@ -226,8 +226,7 @@ func parseMsg(confRoot, confName, msg, tag string) ( } slog.Info("conventional commit", "commit", conventionalCommit) confRoot = filepath.Clean(confRoot) - confPath = filepath.Clean(fmt.Sprintf("%s/%s/%s", - confRoot, conventionalCommit.Scope, confName)) + confPath = filepath.Join(confRoot, conventionalCommit.Scope, confName) relPath, err := filepath.Rel(confRoot, confPath) if err != nil { return @@ -289,8 +288,7 @@ func GetConfPath(confRoot, confName, fallbackConfName, msg, tag string) ( if err != nil { slog.Error("parse msg", "error", err) // fallback to conf file in conf root on parse error - confPath = filepath.Clean( - fmt.Sprintf("%s/%s", confRoot, fallbackConfName)) + confPath = filepath.Join(confRoot, fallbackConfName) slog.Info("fallback to conf", "path", confPath) } confStat, err = os.Stat(confPath) @@ -300,8 +298,7 @@ func GetConfPath(confRoot, confName, fallbackConfName, msg, tag string) ( } slog.Error("stat conf", "error", err) // fallback to conf file in conf root on conf not exist - confPath = filepath.Clean( - fmt.Sprintf("%s/%s", confRoot, fallbackConfName)) + confPath = filepath.Join(confRoot, fallbackConfName) slog.Info("fallback to conf", "path", confPath) confStat, err = os.Stat(confPath) if err != nil {