Support db prefix and --repo/--aur on -G

This commit is contained in:
morganamilo 2018-06-01 05:04:15 +01:00
parent 444ccce925
commit 14b66043a2
No known key found for this signature in database
GPG Key ID: 6FE9E7996B0B082E

View File

@ -100,23 +100,40 @@ func downloadAndUnpack(url string, path string) (err error) {
} }
func getPkgbuilds(pkgs []string) error { func getPkgbuilds(pkgs []string) error {
//possibleAurs := make([]string, 0, 0) missing := false
wd, err := os.Getwd() wd, err := os.Getwd()
if err != nil { if err != nil {
return err return err
} }
missing, err := getPkgbuildsfromABS(pkgs, wd) pkgs = removeInvalidTargets(pkgs)
if err != nil {
return err aur, repo, err := packageSlices(pkgs)
if len(repo) > 0 {
missing, err = getPkgbuildsfromABS(repo, wd)
if err != nil {
return err
}
}
if len(aur) > 0 {
_missing, err := getPkgbuildsfromAUR(aur, wd)
if err != nil {
return err
}
missing = missing || _missing
}
if missing {
err = fmt.Errorf("")
} }
err = getPkgbuildsfromAUR(missing, wd)
return err return err
} }
// GetPkgbuild downloads pkgbuild from the ABS. // GetPkgbuild downloads pkgbuild from the ABS.
func getPkgbuildsfromABS(pkgs []string, path string) (missing []string, err error) { func getPkgbuildsfromABS(pkgs []string, path string) (missing bool,err error) {
dbList, err := alpmHandle.SyncDbs() dbList, err := alpmHandle.SyncDbs()
if err != nil { if err != nil {
return return
@ -124,8 +141,14 @@ func getPkgbuildsfromABS(pkgs []string, path string) (missing []string, err erro
nextPkg: nextPkg:
for _, pkgN := range pkgs { for _, pkgN := range pkgs {
pkgDb, name := splitDbFromName(pkgN)
for _, db := range dbList.Slice() { for _, db := range dbList.Slice() {
pkg, err := db.PkgByName(pkgN) if pkgDb != "" && db.Name() != pkgDb {
continue
}
pkg, err := db.PkgByName(name)
if err == nil { if err == nil {
var url string var url string
name := pkg.Base() name := pkg.Base()
@ -144,7 +167,7 @@ nextPkg:
case "community", "multilib": case "community", "multilib":
url = "https://git.archlinux.org/svntogit/community.git/snapshot/packages/" + name + ".tar.gz" url = "https://git.archlinux.org/svntogit/community.git/snapshot/packages/" + name + ".tar.gz"
default: default:
fmt.Println(name + " not in standard repositories") fmt.Println(pkgN, "not in standard repositories")
continue nextPkg continue nextPkg
} }
@ -164,7 +187,8 @@ nextPkg:
} }
} }
missing = append(missing, pkgN) fmt.Println(pkgN, "could not find package in database")
missing = true
} }
if _, err := os.Stat(filepath.Join(cacheHome, "packages")); err == nil { if _, err := os.Stat(filepath.Join(cacheHome, "packages")); err == nil {
@ -175,14 +199,25 @@ nextPkg:
} }
// GetPkgbuild downloads pkgbuild from the AUR. // GetPkgbuild downloads pkgbuild from the AUR.
func getPkgbuildsfromAUR(pkgs []string, dir string) (err error) { func getPkgbuildsfromAUR(pkgs []string, dir string) (bool, error) {
aq, err := aurInfoPrint(pkgs) missing := false
strippedPkgs := make([]string, 0)
for _, pkg := range pkgs {
_, name := splitDbFromName(pkg)
strippedPkgs = append(strippedPkgs, name)
}
aq, err := aurInfoPrint(strippedPkgs)
if err != nil { if err != nil {
return err return missing, err
} }
for _, pkg := range aq { for _, pkg := range aq {
var err error if _, err := os.Stat(filepath.Join(dir, pkg.PackageBase)); err == nil {
fmt.Println(bold(red(arrow)), bold(cyan(pkg.Name)), "directory already exists")
continue
}
if shouldUseGit(filepath.Join(dir, pkg.PackageBase)) { if shouldUseGit(filepath.Join(dir, pkg.PackageBase)) {
err = gitDownload(baseURL+"/"+pkg.PackageBase+".git", dir, pkg.PackageBase) err = gitDownload(baseURL+"/"+pkg.PackageBase+".git", dir, pkg.PackageBase)
} else { } else {
@ -197,8 +232,8 @@ func getPkgbuildsfromAUR(pkgs []string, dir string) (err error) {
} }
if len(aq) != len(pkgs) { if len(aq) != len(pkgs) {
return fmt.Errorf("Could not find all required packages") missing = true
} }
return return missing, err
} }