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

fix(clean_menu): anyExistInCache already verifies if cleanMenu is necessary

Browse Source
This commit is contained in:
jguer 2021-10-11 00:10:40 +02:00 committed by J Guerreiro
parent 1fb9f410a6
commit a43fbacc96
2 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
clean_menu.go
View File

@ -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
}

6
install.go
View File

@ -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) {