Browse Source

Fallback to default config if it can't be read

pull/8/head
Daniel Martí 11 years ago
parent
commit
28021dad54
  1. 16
      cmd/fdroidcl/main.go

16
cmd/fdroidcl/main.go

@ -65,18 +65,19 @@ var config = userConfig{
}, },
} }
func readConfig() { func readConfig() error {
f, err := os.Open(configPath()) f, err := os.Open(configPath())
if err != nil { if err != nil {
if !os.IsNotExist(err) { if os.IsNotExist(err) {
log.Fatalf("Error when opening config file: %v", err) return nil
} }
return return fmt.Errorf("could not open config file: %v", err)
} }
defer f.Close() defer f.Close()
if err := json.NewDecoder(f).Decode(&config); err != nil { if err := json.NewDecoder(f).Decode(&config); err != nil {
log.Fatalf("Error when decoding config file: %v", err) return fmt.Errorf("could not decode config file: %v", err)
} }
return nil
} }
func mustOneRepo() *Repo { func mustOneRepo() *Repo {
@ -168,7 +169,10 @@ func main() {
if cmd.Name() != args[0] { if cmd.Name() != args[0] {
continue continue
} }
readConfig() if err := readConfig(); err != nil {
log.Printf("Could not load config: %v", err)
log.Printf("Using default config")
}
cmd.Flag.Usage = func() { cmd.Usage() } cmd.Flag.Usage = func() { cmd.Usage() }
cmd.Flag.Parse(args[1:]) cmd.Flag.Parse(args[1:])
args = cmd.Flag.Args() args = cmd.Flag.Args()

Loading…
Cancel
Save