diff --git a/clean_menu.go b/clean_menu.go index c237462d..e0ec5a8f 100644 --- a/clean_menu.go +++ b/clean_menu.go @@ -15,13 +15,9 @@ import ( "github.com/Jguer/yay/v11/pkg/text" ) -func cleanNumberMenu(bases []dep.Base, installed stringset.StringSet, hasClean bool) ([]dep.Base, error) { +func cleanNumberMenu(bases []dep.Base, installed stringset.StringSet) ([]dep.Base, error) { toClean := make([]dep.Base, 0) - if !hasClean { - return toClean, nil - } - text.Infoln(gotext.Get("Packages to cleanBuild?")) text.Infoln(gotext.Get("%s [A]ll [Ab]ort [I]nstalled [No]tInstalled or (1 2 3, 1-3, ^4)", text.Cyan(gotext.Get("[N]one")))) @@ -103,9 +99,9 @@ func cleanMenu(cleanMenuOption bool, aurBases []dep.Base, installed stringset.St return nil } - askClean := pkgbuildNumberMenu(aurBases, installed) + pkgbuildNumberMenu(aurBases, installed) - toClean, errClean := cleanNumberMenu(aurBases, installed, askClean) + toClean, errClean := cleanNumberMenu(aurBases, installed) if errClean != nil { return errClean } diff --git a/install.go b/install.go index 6f7261e1..40237c35 100644 --- a/install.go +++ b/install.go @@ -554,9 +554,8 @@ func parsePackageList(ctx context.Context, dir string) (pkgdests map[string]stri return pkgdests, pkgVersion, nil } -func pkgbuildNumberMenu(bases []dep.Base, installed stringset.StringSet) bool { +func pkgbuildNumberMenu(bases []dep.Base, installed stringset.StringSet) { toPrint := "" - askClean := false for n, base := range bases { pkg := base.Pkgbase() @@ -576,15 +575,12 @@ func pkgbuildNumberMenu(bases []dep.Base, installed stringset.StringSet) bool { if _, err := os.Stat(dir); !os.IsNotExist(err) { toPrint += text.Bold(text.Green(gotext.Get(" (Build Files Exist)"))) - askClean = true } toPrint += "\n" } fmt.Print(toPrint) - - return askClean } func editNumberMenu(bases []dep.Base, installed stringset.StringSet) ([]dep.Base, error) {