From 7a964a031c1945d9db811c3e013f191ca31d5d77 Mon Sep 17 00:00:00 2001 From: onyx-and-iris Date: Sun, 13 Apr 2025 17:41:18 +0100 Subject: [PATCH] return err from createTemplate and check it --- cmd/gignore/create.go | 10 +++++++--- cmd/gignore/main.go | 18 +++++++++--------- 2 files changed, 16 insertions(+), 12 deletions(-) diff --git a/cmd/gignore/create.go b/cmd/gignore/create.go index 1028694..4561700 100644 --- a/cmd/gignore/create.go +++ b/cmd/gignore/create.go @@ -24,7 +24,8 @@ Example: } for _, arg := range args { - createTemplate(arg) + err := createTemplate(arg) + cobra.CheckErr(err) } }, } @@ -35,9 +36,12 @@ func init() { } // createTemplate creates a new .gitignore file using the specified template. -func createTemplate(template string) { +func createTemplate(template string) error { err := client.Create(template) - cobra.CheckErr(err) + if err != nil { + return err + } fmt.Printf("√ created %s .gitignore file\n", template) + return nil } diff --git a/cmd/gignore/main.go b/cmd/gignore/main.go index a867be3..761d10c 100644 --- a/cmd/gignore/main.go +++ b/cmd/gignore/main.go @@ -39,22 +39,22 @@ It supports various programming languages. // init initialises the root command and adds global flags. func init() { + getEnv := func(key, defaultValue string) string { + value := os.Getenv(key) + if value == "" { + return defaultValue + } + return value + } + rootCmd.PersistentFlags(). StringP("root", "r", getEnv("GIGNORE_TEMPLATE_ROOT", gignore.DefaultTemplateDirectory), "Root directory to search for .gitignore files") rootCmd.PersistentFlags(). StringP("loglevel", "l", getEnv("GIGNORE_LOGLEVEL", "warn"), "Log level (trace, debug, info, warn, error, fatal, panic)") } -func getEnv(key, defaultValue string) string { - value := os.Getenv(key) - if value == "" { - return defaultValue - } - return value -} - func main() { if err := rootCmd.Execute(); err != nil { - panic(err) + log.Fatal(err) } }