From 08fee366073da4559663d89371aa887cd1a516d9 Mon Sep 17 00:00:00 2001 From: CyberChen Date: Mon, 1 Apr 2024 21:44:00 +0800 Subject: [PATCH 1/2] feat: Add ASCII art logo --- cmd/config/config.go | 11 +++++++---- main.go | 20 ++++++++++++++++++++ 2 files changed, 27 insertions(+), 4 deletions(-) diff --git a/cmd/config/config.go b/cmd/config/config.go index 6d6cdacd..057f5aee 100644 --- a/cmd/config/config.go +++ b/cmd/config/config.go @@ -70,7 +70,7 @@ func WriteConfig(write func(config *Config)) { // loadDefaultConfig 加载默认配置 返回使用的配置文件 func loadDefaultConfig() string { - defaultConfigPaths := []string{} + var defaultConfigPaths []string // 读取工作目录的 config.json if p, err := os.Getwd(); err == nil { @@ -78,8 +78,8 @@ func loadDefaultConfig() string { } // 读取用户目录下的 opensca_config.json - if user, err := user.Current(); err == nil { - defaultConfigPaths = append(defaultConfigPaths, filepath.Join(user.HomeDir, "opensca_config.json")) + if currenUser, err := user.Current(); err == nil { + defaultConfigPaths = append(defaultConfigPaths, filepath.Join(currenUser.HomeDir, "opensca_config.json")) } // 读取 opensca-cli 所在目录下的 config.json @@ -132,7 +132,10 @@ func RegisterDefaultConfig(data []byte) { defalutConfigJson = data if _config == nil { _config = &Config{} - json5.Unmarshal(defalutConfigJson, &_config) + err := json5.Unmarshal(defalutConfigJson, &_config) + if err != nil { + logs.Warnf("unmarshal default config error: %v", err) + } } } diff --git a/main.go b/main.go index f5cb19fb..4b88aa33 100644 --- a/main.go +++ b/main.go @@ -30,6 +30,26 @@ var version string func main() { + /* + ___ ____ ____ _ + / _ \ _ __ ___ _ __ / ___| / ___| / \ + | | | | '_ \ / _ \ '_ \\___ \| | / _ \ + | |_| | |_) | __/ | | |___) | |___ / ___ \ + \___/| .__/ \___|_| |_|____/ \____/_/ \_\ + |_| + */ + + logo := ` + ___ ____ ____ _ + / _ \ _ __ ___ _ __ / ___| / ___| / \ + | | | | '_ \ / _ \ '_ \\___ \| | / _ \ + | |_| | |_) | __/ | | |___) | |___ / ___ \ + \___/| .__/ \___|_| |_|____/ \____/_/ \_\ + |_|` + + fmt.Println(logo) + fmt.Println("Current version: ", version) + // 处理参数 args() From ca82c441e94261a261ca0f5cb4ff908c124dcf24 Mon Sep 17 00:00:00 2001 From: CyberChen <53457978+SuperChen-CC@users.noreply.github.com> Date: Mon, 1 Apr 2024 13:51:11 +0000 Subject: [PATCH 2/2] chore: Remove meaningless comments --- main.go | 9 --------- 1 file changed, 9 deletions(-) diff --git a/main.go b/main.go index 4b88aa33..d7dfaa77 100644 --- a/main.go +++ b/main.go @@ -30,15 +30,6 @@ var version string func main() { - /* - ___ ____ ____ _ - / _ \ _ __ ___ _ __ / ___| / ___| / \ - | | | | '_ \ / _ \ '_ \\___ \| | / _ \ - | |_| | |_) | __/ | | |___) | |___ / ___ \ - \___/| .__/ \___|_| |_|____/ \____/_/ \_\ - |_| - */ - logo := ` ___ ____ ____ _ / _ \ _ __ ___ _ __ / ___| / ___| / \