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

Reset before editing

Browse Source 
Edits where reset via git before building packages. This allows edits to
actually effect the build package.
This commit is contained in:
morganamilo 2018-06-12 21:06:21 +01:00
parent 2718cd3d23
commit 9ecc604558
No known key found for this signature in database
GPG Key ID: 6FE9E7996B0B082E
1 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
install.go
View File

@ -182,6 +182,21 @@ func install(parser *arguments) error {
} }
} }
if len(toDiff) > 0 {
oldValue := config.NoConfirm
config.NoConfirm = false
fmt.Println()
if !continueTask(bold(green("Proceed with install?")), "nN") {
return fmt.Errorf("Aborting due to user")
}
config.NoConfirm = oldValue
}
err = mergePkgBuilds(do.Aur)
if err != nil {
return err
}
if config.EditMenu { if config.EditMenu {
pkgbuildNumberMenu(do.Aur, do.Bases, remoteNamesCache) pkgbuildNumberMenu(do.Aur, do.Bases, remoteNamesCache)
toEdit, err = editNumberMenu(do.Aur, do.Bases, remoteNamesCache) toEdit, err = editNumberMenu(do.Aur, do.Bases, remoteNamesCache)
@ -197,7 +212,7 @@ func install(parser *arguments) error {
} }
} }
if len(toDiff) > 0 || len(toEdit) > 0 { if len(toEdit) > 0 {
oldValue := config.NoConfirm oldValue := config.NoConfirm
config.NoConfirm = false config.NoConfirm = false
fmt.Println() fmt.Println()
@ -207,11 +222,6 @@ func install(parser *arguments) error {
config.NoConfirm = oldValue config.NoConfirm = oldValue
} }
err = mergePkgBuilds(do.Aur)
if err != nil {
return err
}
//initial srcinfo parse before pkgver() bump //initial srcinfo parse before pkgver() bump
err = parseSRCINFOFiles(do.Aur, srcinfosStale, do.Bases) err = parseSRCINFOFiles(do.Aur, srcinfosStale, do.Bases)
if err != nil { if err != nil {