diff options
author | Jesse Duffield <jessedduffield@gmail.com> | 2018-08-22 09:28:19 +1000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-08-22 09:28:19 +1000 |
commit | 584d6b241cc1d4cacb8bda45babbfd148725dee4 (patch) | |
tree | d894e8368ebf8f2c15f991182e5bb285f0bb253c | |
parent | 4d635cd1cd7ed1a32e516d3d93a0449d3c3a130e (diff) | |
parent | 37681627ab46bc97af6cffcc812dadfe98c0852b (diff) |
Merge pull request #198 from antham/fix-various-errors
Fix various errors reported by goreportcard
-rw-r--r-- | pkg/commands/os.go | 3 | ||||
-rw-r--r-- | pkg/config/app_config.go | 10 | ||||
-rw-r--r-- | pkg/test/test.go | 6 |
3 files changed, 6 insertions, 13 deletions
diff --git a/pkg/commands/os.go b/pkg/commands/os.go index 9756d619d..18ff93cc6 100644 --- a/pkg/commands/os.go +++ b/pkg/commands/os.go @@ -175,7 +175,8 @@ func (c *OSCommand) Unquote(message string) string { return message } -func (C *OSCommand) AppendLineToFile(filename, line string) error { +// AppendLineToFile adds a new line in file +func (c *OSCommand) AppendLineToFile(filename, line string) error { f, err := os.OpenFile(filename, os.O_APPEND|os.O_WRONLY|os.O_CREATE, 0600) if err != nil { return err diff --git a/pkg/config/app_config.go b/pkg/config/app_config.go index 9f258d4a6..aa56365e3 100644 --- a/pkg/config/app_config.go +++ b/pkg/config/app_config.go @@ -121,10 +121,7 @@ func LoadUserConfigFromFile(v *viper.Viper) error { folder = configDirs.QueryFolderContainsFile("config.yml") } v.AddConfigPath(folder.Path) - if err := v.MergeInConfig(); err != nil { - return err - } - return nil + return v.MergeInConfig() } // InsertToUserConfig adds a key/value pair to the user's config and saves it @@ -139,10 +136,7 @@ func (c *AppConfig) InsertToUserConfig(key, value string) error { return err } v.Set(key, value) - if err := v.WriteConfig(); err != nil { - return err - } - return nil + return v.WriteConfig() } func getDefaultConfig() []byte { diff --git a/pkg/test/test.go b/pkg/test/test.go index ff133a655..6346ac556 100644 --- a/pkg/test/test.go +++ b/pkg/test/test.go @@ -26,8 +26,6 @@ func GenerateRepo(filename string) error { if output, err := exec.Command("bash", filename).CombinedOutput(); err != nil { return errors.New(string(output)) } - if err := os.Chdir(testPath + "repo"); err != nil { - return err - } - return nil + + return os.Chdir(testPath + "repo") } |