From b58746d1ef3ddfd6320ea116d82c462e2ab24b8e Mon Sep 17 00:00:00 2001 From: morganamilo Date: Sun, 11 Mar 2018 23:00:00 +0000 Subject: [PATCH] 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 --- download.go | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/download.go b/download.go index bccbdf85..72a71822 100644 --- a/download.go +++ b/download.go @@ -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)