Rework fatal mechanism, open config on demand.

main.go

@@ -3,65 +3,18 @@ package main
 import (
 	"fmt"
 	"github.com/smira/aptly/cmd"
-	"github.com/smira/aptly/utils"
-	"github.com/smira/commander"
 	"os"
-	"path/filepath"
 )
 
-var (
-	returnCode   = 0
-	errorMessage string
-)
-
-func fatal(err error) {
-	errorMessage = fmt.Sprintf("ERROR: %s\n", err)
-	returnCode = 1
-}
-
-func loadConfig(command *commander.Command) error {
-	var err error
-
-	configLocation := command.Flag.Lookup("config").Value.String()
-	if configLocation != "" {
-		err = utils.LoadConfig(configLocation, &utils.Config)
-
-		if err != nil {
-			return err
-		}
-	} else {
-		configLocations := []string{
-			filepath.Join(os.Getenv("HOME"), ".aptly.conf"),
-			"/etc/aptly.conf",
-		}
-
-		for _, configLocation := range configLocations {
-			err = utils.LoadConfig(configLocation, &utils.Config)
-			if err == nil {
-				break
-			}
-			if !os.IsNotExist(err) {
-				fatal(fmt.Errorf("error loading config file %s: %s", configLocation, err))
-				return nil
-			}
-		}
-
-		if err != nil {
-			fmt.Printf("Config file not found, creating default config at %s\n\n", configLocations[0])
-			utils.SaveConfig(configLocations[0], &utils.Config)
-		}
-	}
-
-	return nil
-}
-
 func main() {
 	defer func() {
-		if errorMessage != "" {
-			fmt.Print(errorMessage)
-		}
-		if returnCode != 0 {
-			os.Exit(returnCode)
+		if r := recover(); r != nil {
+			fatal, ok := r.(*cmd.FatalError)
+			if !ok {
+				panic(r)
+			}
+			fmt.Println("ERROR:", fatal.Message)
+			os.Exit(fatal.ReturnCode)
 		}
 	}()
 
@@ -69,29 +22,17 @@ func main() {
 
 	flags, args, err := command.ParseFlags(os.Args[1:])
 	if err != nil {
-		fatal(err)
-		return
-	}
-
-	err = loadConfig(command)
-	if err != nil {
-		fatal(err)
-		return
-	}
-	if returnCode != 0 {
-		return
+		cmd.Fatal(err)
 	}
 
 	err = cmd.InitContext(flags)
 	if err != nil {
-		fatal(err)
-		return
+		cmd.Fatal(err)
 	}
 	defer cmd.ShutdownContext()
 
 	err = command.Dispatch(args)
 	if err != nil {
-		fatal(err)
-		return
+		cmd.Fatal(err)
 	}
 }