parent
7b2e1ac282
commit
c82b8bae20
1 changed files with 1 additions and 11 deletions
12
config.go
12
config.go
|
@ -222,21 +222,11 @@ func loadConfig() (*config, []string, error) {
|
||||||
DataDir: defaultAppDataDir,
|
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
|
// Pre-parse the command line options to see if an alternative config
|
||||||
// file or the version flag was specified.
|
// file or the version flag was specified.
|
||||||
preCfg := cfg
|
preCfg := cfg
|
||||||
preParser := flags.NewParser(&preCfg, flags.Default)
|
preParser := flags.NewParser(&preCfg, flags.Default)
|
||||||
_, err = preParser.Parse()
|
_, err := preParser.Parse()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
if e, ok := err.(*flags.Error); !ok || e.Type != flags.ErrHelp {
|
if e, ok := err.(*flags.Error); !ok || e.Type != flags.ErrHelp {
|
||||||
preParser.WriteHelp(os.Stderr)
|
preParser.WriteHelp(os.Stderr)
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue