Bladeren bron

run cleanafter after finishing the install process

Cleanafter is now run right at the very end of install instead of after
each makepkg command.
morganamilo 7 jaren geleden
bovenliggende
commit
e1f3cb6682
2 gewijzigde bestanden met toevoegingen van 16 en 5 verwijderingen
  1. 0 5
      cmd.go
  2. 16 0
      install.go

+ 0 - 5
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
 }

+ 16 - 0
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 {