From 0e695468b80da3ed9d7b2fe479f49b46267e2390 Mon Sep 17 00:00:00 2001
From: morganamilo <morganamilo@gmail.com>
Date: Tue, 4 Sep 2018 23:05:35 +0100
Subject: [PATCH] Expand env before making builddir

---
 cmd.go  | 6 ------
 main.go | 4 ++++
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/cmd.go b/cmd.go
index 1e9e0b58c..8819e7396 100644
--- a/cmd.go
+++ b/cmd.go
@@ -128,12 +128,6 @@ If no operation is provided -Y will be assumed`)
 }
 
 func handleCmd() (err error) {
-	if shouldSaveConfig {
-		config.saveConfig()
-	}
-
-	config.expandEnv()
-
 	if cmdArgs.existsArg("h", "help") {
 		err = handleHelp()
 		return
diff --git a/main.go b/main.go
index b108bf9b1..304c03a40 100644
--- a/main.go
+++ b/main.go
@@ -202,6 +202,10 @@ func main() {
 	exitOnError(initHomeDirs())
 	exitOnError(initConfig())
 	exitOnError(cmdArgs.parseCommandLine())
+	if shouldSaveConfig {
+		config.saveConfig()
+	}
+	config.expandEnv()
 	exitOnError(initBuildDir())
 	exitOnError(initVCS())
 	exitOnError(initAlpm())