From febccaef3a74aa07cc585dcd235390f5a0d77ee0 Mon Sep 17 00:00:00 2001
From: morganamilo <morganamilo@gmail.com>
Date: Sun, 12 Aug 2018 02:40:43 +0100
Subject: [PATCH] Reorder main

Split functions out into smaller, more simple chunks. Ensure the correct
order of things.

Before, initConfig() would also create config.BuildDirbefore
the command line flags have been applied, so yay would
try to mkdir what was in the config, ignoring the flag.
---
 main.go   | 86 +++++++++++++++++++++++++++++++------------------------
 parser.go |  1 +
 2 files changed, 49 insertions(+), 38 deletions(-)

diff --git a/main.go b/main.go
index 262bb054..73cf2f4b 100644
--- a/main.go
+++ b/main.go
@@ -46,59 +46,67 @@ func setPaths() error {
 }
 
 func initConfig() error {
-	defaultSettings(&config)
-
-	if _, err := os.Stat(configFile); os.IsNotExist(err) {
-		if err = os.MkdirAll(filepath.Dir(configFile), 0755); err != nil {
-			return fmt.Errorf("Unable to create config directory:\n%s\n"+
-				"The error was:\n%s", filepath.Dir(configFile), err)
-		}
-		// Save the default config if nothing is found
-		return config.saveConfig()
-	} else if err != nil {
-		return err
-	}
-
-	cfile, err := os.OpenFile(configFile, os.O_RDWR|os.O_CREATE, 0644)
-	if err != nil {
-		return fmt.Errorf("Error reading config: %s\n", err)
+	cfile, err := os.Open(configFile)
+	if !os.IsNotExist(err) && err != nil {
+		return fmt.Errorf("Failed to open config file '%s': %s", configFile, err)
 	}
 
 	defer cfile.Close()
-	decoder := json.NewDecoder(cfile)
-	if err = decoder.Decode(&config); err != nil {
-		return fmt.Errorf("Error reading config: %s",
-			err)
-	}
-
-	if _, err = os.Stat(config.BuildDir); os.IsNotExist(err) {
-		if err = os.MkdirAll(config.BuildDir, 0755); err != nil {
-			return fmt.Errorf("Unable to create BuildDir directory:\n%s\n"+
-				"The error was:\n%s", config.BuildDir, err)
+	if !os.IsNotExist(err) {
+		decoder := json.NewDecoder(cfile)
+		if err = decoder.Decode(&config); err != nil {
+			return fmt.Errorf("Failed to read config '%s': %s", configFile, err)
 		}
 	}
 
-	return err
+	return nil
 }
 
 func initVCS() error {
-	if _, err := os.Stat(vcsFile); os.IsNotExist(err) {
-		if err = os.MkdirAll(filepath.Dir(vcsFile), 0755); err != nil {
-			return fmt.Errorf("Unable to create vcs directory:\n%s\n"+
-				"The error was:\n%s", filepath.Dir(configFile), err)
+	vfile, err := os.Open(vcsFile)
+	if !os.IsNotExist(err) && err != nil {
+		return fmt.Errorf("Failed to open vcs file '%s': %s", vcsFile, err)
+	}
+
+	defer vfile.Close()
+	if !os.IsNotExist(err) {
+		decoder := json.NewDecoder(vfile)
+		if err = decoder.Decode(&savedInfo); err != nil {
+			return fmt.Errorf("Failed to read vcs '%s': %s", vcsFile, err)
+		}
+	}
+
+	return nil
+}
+
+func initHomeDirs() error {
+	if _, err := os.Stat(configHome); os.IsNotExist(err) {
+		if err = os.MkdirAll(configHome, 0755); err != nil {
+			return fmt.Errorf("Failed to create config directory '%s': %s", configHome, err)
 		}
 	} else if err != nil {
 		return err
 	}
 
-	vfile, err := os.OpenFile(vcsFile, os.O_RDONLY|os.O_CREATE, 0644)
-	if err != nil {
+	if _, err := os.Stat(cacheHome); os.IsNotExist(err) {
+		if err = os.MkdirAll(cacheHome, 0755); err != nil {
+			return fmt.Errorf("Failed to create cache directory '%s': %s", cacheHome, err)
+		}
+	} else if err != nil {
 		return err
 	}
 
-	defer vfile.Close()
-	decoder := json.NewDecoder(vfile)
-	_ = decoder.Decode(&savedInfo)
+	return nil
+}
+
+func initBuildDir() error {
+	if _, err := os.Stat(config.BuildDir); os.IsNotExist(err) {
+		if err = os.MkdirAll(config.BuildDir, 0755); err != nil {
+			return fmt.Errorf("Failed to create BuildDir directory '%s': %s", config.BuildDir, err)
+		}
+	} else if err != nil {
+		return err
+	}
 
 	return nil
 }
@@ -201,10 +209,12 @@ func main() {
 		fmt.Println("Please avoid running yay as root/sudo.")
 	}
 
-	exitOnError(cmdArgs.parseCommandLine())
 	exitOnError(setPaths())
+	defaultSettings(&config)
+	exitOnError(initHomeDirs())
 	exitOnError(initConfig())
-	cmdArgs.extractYayOptions()
+	exitOnError(cmdArgs.parseCommandLine())
+	exitOnError(initBuildDir())
 	exitOnError(initVCS())
 	exitOnError(initAlpm())
 	exitOnError(handleCmd())
diff --git a/parser.go b/parser.go
index b4d22d5c..27b45589 100644
--- a/parser.go
+++ b/parser.go
@@ -853,6 +853,7 @@ func (parser *arguments) parseCommandLine() (err error) {
 		os.Stdin = file
 	}
 
+	cmdArgs.extractYayOptions()
 	return
 }