system/yay
system/yay
1
0
Fork 0
mirror of https://github.com/Jguer/yay synced 2024-10-31 04:12:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #559 from Morganamilo/install

Browse source 
Show .install files with pkgbuilds when editing
This commit is contained in:
Anna 2018-07-19 17:23:03 +01:00 committed by GitHub
commit c10716ab1a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 22 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
install.go
View file

@ -259,6 +259,12 @@ func install(parser *arguments) error {
return err return err
} }
//initial srcinfo parse before pkgver() bump
err = parseSRCINFOFiles(do.Aur, srcinfosStale, do.Bases)
if err != nil {
return err
}
var toDiff []*rpc.Pkg var toDiff []*rpc.Pkg
var toEdit []*rpc.Pkg var toEdit []*rpc.Pkg
@ -270,7 +276,7 @@ func install(parser *arguments) error {
} }
if len(toDiff) > 0 { if len(toDiff) > 0 {
err = showPkgBuildDiffs(toDiff, do.Bases, cloned) err = showPkgBuildDiffs(toDiff, srcinfosStale, do.Bases, cloned)
if err != nil { if err != nil {
return err return err
} }
@ -300,7 +306,7 @@ func install(parser *arguments) error {
} }
if len(toEdit) > 0 { if len(toEdit) > 0 {
err = editPkgBuilds(toEdit, do.Bases) err = editPkgBuilds(toEdit, srcinfosStale, do.Bases)
if err != nil { if err != nil {
return err return err
} }
@ -317,12 +323,6 @@ func install(parser *arguments) error {
config.NoConfirm = oldValue config.NoConfirm = oldValue
} }
//initial srcinfo parse before pkgver() bump
err = parseSRCINFOFiles(do.Aur, srcinfosStale, do.Bases)
if err != nil {
return err
}
incompatible, err = getIncompatible(do.Aur, srcinfosStale, do.Bases) incompatible, err = getIncompatible(do.Aur, srcinfosStale, do.Bases)
if err != nil { if err != nil {
return err return err
@ -651,7 +651,7 @@ func cleanBuilds(pkgs []*rpc.Pkg) {
} }
} }
func showPkgBuildDiffs(pkgs []*rpc.Pkg, bases map[string][]*rpc.Pkg, cloned stringSet) error { func showPkgBuildDiffs(pkgs []*rpc.Pkg, srcinfos map[string]*gosrc.Srcinfo, bases map[string][]*rpc.Pkg, cloned stringSet) error {
for _, pkg := range pkgs { for _, pkg := range pkgs {
dir := filepath.Join(config.BuildDir, pkg.PackageBase) dir := filepath.Join(config.BuildDir, pkg.PackageBase)
if shouldUseGit(dir) { if shouldUseGit(dir) {
@ -684,6 +684,12 @@ func showPkgBuildDiffs(pkgs []*rpc.Pkg, bases map[string][]*rpc.Pkg, cloned stri
} else { } else {
editor, editorArgs := editor() editor, editorArgs := editor()
editorArgs = append(editorArgs, filepath.Join(dir, "PKGBUILD")) editorArgs = append(editorArgs, filepath.Join(dir, "PKGBUILD"))
for _, splitPkg := range srcinfos[pkg.PackageBase].SplitPackages() {
if splitPkg.Install != "" {
editorArgs = append(editorArgs, filepath.Join(dir, splitPkg.Install))
}
}
editcmd := exec.Command(editor, editorArgs...) editcmd := exec.Command(editor, editorArgs...)
editcmd.Stdin, editcmd.Stdout, editcmd.Stderr = os.Stdin, os.Stdout, os.Stderr editcmd.Stdin, editcmd.Stdout, editcmd.Stderr = os.Stdin, os.Stdout, os.Stderr
err := editcmd.Run() err := editcmd.Run()
@ -696,11 +702,17 @@ func showPkgBuildDiffs(pkgs []*rpc.Pkg, bases map[string][]*rpc.Pkg, cloned stri
return nil return nil
} }
func editPkgBuilds(pkgs []*rpc.Pkg, bases map[string][]*rpc.Pkg) error { func editPkgBuilds(pkgs []*rpc.Pkg, srcinfos map[string]*gosrc.Srcinfo, bases map[string][]*rpc.Pkg) error {
pkgbuilds := make([]string, 0, len(pkgs)) pkgbuilds := make([]string, 0, len(pkgs))
for _, pkg := range pkgs { for _, pkg := range pkgs {
dir := filepath.Join(config.BuildDir, pkg.PackageBase) dir := filepath.Join(config.BuildDir, pkg.PackageBase)
pkgbuilds = append(pkgbuilds, filepath.Join(dir, "PKGBUILD")) pkgbuilds = append(pkgbuilds, filepath.Join(dir, "PKGBUILD"))
for _, splitPkg := range srcinfos[pkg.PackageBase].SplitPackages() {
if splitPkg.Install != "" {
pkgbuilds = append(pkgbuilds, filepath.Join(dir, splitPkg.Install))
}
}
} }
if len(pkgbuilds) > 0 { if len(pkgbuilds) > 0 {