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

Merge pull request #102 from Morganamilo/countfrom0again

Browse Source 
Count from 0 on upgrade prompt
This commit is contained in:
J Guerreiro 2018-01-18 21:13:55 +09:00 committed by GitHub
commit 7c4aa993f7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
upgrade.go
View File

@ -301,8 +301,8 @@ func upgradePkgs(flags []string) error {
var aurNums []int var aurNums []int
sort.Sort(repoUp) sort.Sort(repoUp)
fmt.Printf("\x1b[1;34;1m:: \x1b[0m\x1b[1m%d Packages to upgrade.\x1b[0m\n", len(aurUp)+len(repoUp)) fmt.Printf("\x1b[1;34;1m:: \x1b[0m\x1b[1m%d Packages to upgrade.\x1b[0m\n", len(aurUp)+len(repoUp))
repoUp.Print(len(aurUp)) repoUp.Print(len(aurUp) + 1)
aurUp.Print(0) aurUp.Print(1)
if !config.NoConfirm { if !config.NoConfirm {
fmt.Print("\x1b[32mEnter packages you don't want to upgrade.\x1b[0m\nNumbers: ") fmt.Print("\x1b[32mEnter packages you don't want to upgrade.\x1b[0m\nNumbers: ")
@ -333,17 +333,17 @@ func upgradePkgs(flags []string) error {
numbers = []int{num} numbers = []int{num}
} }
for _, target := range numbers { for _, target := range numbers {
if target > len(aurUp)+len(repoUp)-1 || target < 0 { if target > len(aurUp)+len(repoUp) || target <= 0 {
continue continue
} else if target < len(aurUp) { } else if target <= len(aurUp) {
target = len(aurUp) - target - 1 target = len(aurUp) - target
if negate { if negate {
excludeAur = append(excludeAur, target) excludeAur = append(excludeAur, target)
} else { } else {
aurNums = append(aurNums, target) aurNums = append(aurNums, target)
} }
} else { } else {
target = len(aurUp) + len(repoUp) - target - 1 target = len(aurUp) + len(repoUp) - target
if negate { if negate {
excludeRepo = append(excludeRepo, target) excludeRepo = append(excludeRepo, target)
} else { } else {