Fix -G for non split packages and support multilib

A while ago the url to download a pkgbuild was using pkg.Name(), it was
latter changed to pkg.Base() to support split packages. It seems that
pkg.Base() does not work for non split packages for some reason.

So instead try pkg.Base() and if it is empty default to pkg.Name().

Also add support for downloading from multilib
This commit is contained in:
morganamilo 2018-03-11 23:00:00 +00:00
parent 1232854fd4
commit b58746d1ef
No known key found for this signature in database
GPG key ID: 6FE9E7996B0B082E

View file

@ -91,12 +91,18 @@ nextPkg:
pkg, err := db.PkgByName(pkgN)
if err == nil {
var url string
name := pkg.Base()
if name == "" {
name = pkg.Name()
}
if db.Name() == "core" || db.Name() == "extra" {
url = "https://projects.archlinux.org/svntogit/packages.git/snapshot/packages/" + pkg.Base() + ".tar.gz"
} else if db.Name() == "community" {
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/" + name + ".tar.gz"
} else if db.Name() == "community" || db.Name() == "multilib" {
url = "https://projects.archlinux.org/svntogit/community.git/snapshot/community-packages/" + name + ".tar.gz"
} else {
fmt.Println(pkgN + " not in standard repositories")
continue nextPkg
}
errD := downloadAndUnpack(url, path, true)