From c82b8bae201315217754cb7af2ab15f34eeaf9de Mon Sep 17 00:00:00 2001 From: Josh Rickmar Date: Mon, 18 Apr 2016 11:10:16 -0400 Subject: [PATCH] Ignore config in current directory by default. Fixes #415. --- config.go | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/config.go b/config.go index 3b03777..3855bff 100644 --- a/config.go +++ b/config.go @@ -222,21 +222,11 @@ func loadConfig() (*config, []string, error) { DataDir: defaultAppDataDir, } - // A config file in the current directory takes precedence. - exists, err := cfgutil.FileExists(defaultConfigFilename) - if err != nil { - fmt.Fprintln(os.Stderr, err) - return nil, nil, err - } - if exists { - cfg.ConfigFile = defaultConfigFile - } - // Pre-parse the command line options to see if an alternative config // file or the version flag was specified. preCfg := cfg preParser := flags.NewParser(&preCfg, flags.Default) - _, err = preParser.Parse() + _, err := preParser.Parse() if err != nil { if e, ok := err.(*flags.Error); !ok || e.Type != flags.ErrHelp { preParser.WriteHelp(os.Stderr)