run cleanafter after finishing the install process
Cleanafter is now run right at the very end of install instead of after each makepkg command.
This commit is contained in:
2 files changed
+16
-5
No files matched your search
@@ -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
|
||||
}
|
||||
+16
@@ -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 {
|
||||
|
||||
Reference in new issue
Block a user