From e1f3cb66821babb9dbee1b1bae1ea4b990bdc324 Mon Sep 17 00:00:00 2001 From: morganamilo Date: Thu, 15 Feb 2018 21:23:34 +0000 Subject: [PATCH] run cleanafter after finishing the install process Cleanafter is now run right at the very end of install instead of after each makepkg command. --- cmd.go | 5 ----- install.go | 16 ++++++++++++++++ 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/cmd.go b/cmd.go index ec8d7beb..30ac5b63 100644 --- a/cmd.go +++ b/cmd.go @@ -702,11 +702,6 @@ func passToMakepkg(dir string, args ...string) (err error) { err = cmd.Run() if err == nil { _ = saveVCSInfo() - if config.CleanAfter { - fmt.Println(boldGreenFg(arrow + - " CleanAfter enabled. Deleting source folder.")) - os.RemoveAll(dir) - } } return } diff --git a/install.go b/install.go index 5bf601ea..d6c92b35 100644 --- a/install.go +++ b/install.go @@ -195,6 +195,11 @@ func install(parser *arguments) error { config.NoConfirm = oldValue } + if config.CleanAfter { + clean(dc.AurMake) + clean(dc.Aur) + } + return nil } @@ -416,6 +421,17 @@ func buildInstallPkgBuilds(pkgs []*rpc.Pkg, srcinfos map[string]*gopkg.PKGBUILD, return nil } +func clean(pkgs []*rpc.Pkg) { + for _, pkg := range pkgs { + dir := config.BuildDir + pkg.PackageBase + "/" + + fmt.Println(boldGreenFg(arrow + + " CleanAfter enabled. Deleting " + pkg.Name +" source folder.")) + os.RemoveAll(dir) + } +} + + func completeFileName(dir, name string) (string, error) { files, err := ioutil.ReadDir(dir) if err != nil {