Expand env before making builddir

Daanikus · Sep 4, 2018 · 0e69546 · 0e69546
1 parent a109ea4
commit 0e69546
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git 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
@@ -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())