sharpetronics/yay
1
0
Fork 0
mirror of https://github.com/Jguer/yay.git synced 2025-10-11 00:03:47 -04:00
Code Issues Projects Releases Wiki Activity

Merge pull request #687 from Morganamilo/expandenv

Browse Source 
Expand env before making builddir
This commit is contained in:
Anna 2018-09-04 23:07:59 +01:00 committed by GitHub
commit d3a2a060b2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cmd.go
View File

@ -128,12 +128,6 @@ If no operation is provided -Y will be assumed`)
} }
func handleCmd() (err error) { func handleCmd() (err error) {
if shouldSaveConfig {
config.saveConfig()
}
config.expandEnv()
if cmdArgs.existsArg("h", "help") { if cmdArgs.existsArg("h", "help") {
err = handleHelp() err = handleHelp()
return return

4
main.go
View File

@ -202,6 +202,10 @@ func main() {
exitOnError(initHomeDirs()) exitOnError(initHomeDirs())
exitOnError(initConfig()) exitOnError(initConfig())
exitOnError(cmdArgs.parseCommandLine()) exitOnError(cmdArgs.parseCommandLine())
if shouldSaveConfig {
config.saveConfig()
}
config.expandEnv()
exitOnError(initBuildDir()) exitOnError(initBuildDir())
exitOnError(initVCS()) exitOnError(initVCS())
exitOnError(initAlpm()) exitOnError(initAlpm())