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

Use aurInfo() for -G

Browse source
This commit is contained in:
morganamilo 2018-02-17 17:44:30 +00:00
parent 346a579c23
commit 3fb77b1d72
No known key found for this signature in database
GPG key ID: 6FE9E7996B0B082E
2 changed files with 40 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
cmd.go
View file

@ -448,16 +448,7 @@ func handleYay() (err error) {
} }
func handleGetpkgbuild() (err error) { func handleGetpkgbuild() (err error) {
for pkg := range cmdArgs.targets { err = getPkgbuilds(cmdArgs.formatTargets())
err = getPkgbuild(pkg)
if err != nil {
//we print the error instead of returning it
//seems as we can handle multiple errors without stoping
//theres no easy way around this right now
fmt.Println(pkg+":", err)
}
}
return return
} }

69
download.go
View file

@ -7,8 +7,6 @@ import (
"os" "os"
"os/exec" "os/exec"
"strings" "strings"
rpc "github.com/mikkeloscar/aur"
) )
func downloadFile(path string, url string) (err error) { func downloadFile(path string, url string) (err error) {
@ -63,60 +61,71 @@ func downloadAndUnpack(url string, path string, trim bool) (err error) {
return return
} }
func getPkgbuild(pkg string) (err error) { func getPkgbuilds(pkgs []string) (error) {
//possibleAurs := make([]string, 0, 0)
wd, err := os.Getwd() wd, err := os.Getwd()
if err != nil { if err != nil {
return return err
} }
wd = wd + "/" wd = wd + "/"
err = getPkgbuildfromABS(pkg, wd) missing, err := getPkgbuildsfromABS(pkgs, wd)
if err == nil { if err != nil {
return return err
} }
err = getPkgbuildfromAUR(pkg, wd) err = getPkgbuildsfromAUR(missing, wd)
return return err
} }
// GetPkgbuild downloads pkgbuild from the ABS. // GetPkgbuild downloads pkgbuild from the ABS.
func getPkgbuildfromABS(pkgN string, path string) (err error) { func getPkgbuildsfromABS(pkgs []string, path string) (missing []string, err error) {
dbList, err := alpmHandle.SyncDbs() dbList, err := alpmHandle.SyncDbs()
if err != nil { if err != nil {
return return
} }
for _, db := range dbList.Slice() { nextPkg:
pkg, err := db.PkgByName(pkgN) for _, pkgN := range pkgs {
if err == nil { for _, db := range dbList.Slice() {
var url string pkg, err := db.PkgByName(pkgN)
if db.Name() == "core" || db.Name() == "extra" { if err == nil {
url = "https://projects.archlinux.org/svntogit/packages.git/snapshot/packages/" + pkg.Base() + ".tar.gz" var url string
} else if db.Name() == "community" { if db.Name() == "core" || db.Name() == "extra" {
url = "https://projects.archlinux.org/svntogit/community.git/snapshot/community-packages/" + pkg.Base() + ".tar.gz" url = "https://projects.archlinux.org/svntogit/packages.git/snapshot/packages/" + pkg.Base() + ".tar.gz"
} else { } else if db.Name() == "community" {
return fmt.Errorf("Not in standard repositories") url = "https://projects.archlinux.org/svntogit/community.git/snapshot/community-packages/" + pkg.Base() + ".tar.gz"
} else {
fmt.Println(pkgN + " not in standard repositories")
}
errD := downloadAndUnpack(url, path, true)
if errD != nil {
fmt.Println(boldYellowFg(pkg.Name()), boldGreenFg(errD.Error()))
}
fmt.Println(boldGreenFg(arrow), boldGreenFg("Downloaded"), boldYellowFg(pkg.Name()), boldGreenFg("from ABS"))
continue nextPkg
} }
fmt.Println(boldGreenFg(arrow), boldYellowFg(pkgN), boldGreenFg("found in ABS."))
errD := downloadAndUnpack(url, path, true)
return errD
} }
missing = append(missing, pkgN)
} }
return fmt.Errorf("package not found")
return
} }
// GetPkgbuild downloads pkgbuild from the AUR. // GetPkgbuild downloads pkgbuild from the AUR.
func getPkgbuildfromAUR(pkgN string, dir string) (err error) { func getPkgbuildsfromAUR(pkgs []string, dir string) (err error) {
aq, err := rpc.Info([]string{pkgN}) aq, err := aurInfo(pkgs)
if err != nil { if err != nil {
return err return err
} }
if len(aq) == 0 { for _, pkg := range aq {
return fmt.Errorf("no results") downloadAndUnpack(baseURL+aq[0].URLPath, dir, false)
fmt.Println(boldGreenFg(arrow), boldGreenFg("Downloaded"), boldYellowFg(pkg.Name), boldGreenFg("from AUR"))
} }
fmt.Println(boldGreenFg(arrow), boldYellowFg(pkgN), boldGreenFg("found in AUR."))
downloadAndUnpack(baseURL+aq[0].URLPath, dir, false)
return return
} }