Merge pull request #687 from Morganamilo/expandenv

Expand env before making builddir

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

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())