mirror of
https://github.com/Jguer/yay
synced 2024-09-14 13:51:12 +00:00
Support any PKGDEST and PKGEXT
Pacman 5.1 removes the symlink to the current directory for built packages. This causes Yay to break for people who have set an external PKGDEST. Pacman 5.1 also brings an improved --packagelist option. This makes it much simpler to find where packages will be placed. Hence this fix also simplifies the code. Yay has an -Sc option to clear it's cache. If using an external PKGDEST this is now mostly useful for clearing out old pkgbuilds and sources. paccache should be used for cleaning build packages.
This commit is contained in:
parent
c36bfc1237
commit
9afd671905
74
install.go
74
install.go
|
@ -303,22 +303,36 @@ nextpkg:
|
||||||
return incompatible, nil
|
return incompatible, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func getVersionFromPkgbuild(dir string) (string, error) {
|
func parsePackageList(dir string) (map[string]string, error) {
|
||||||
stdout, stderr, err := passToMakepkgCapture(dir, "--packagelist")
|
stdout, stderr, err := passToMakepkgCapture(dir, "--packagelist")
|
||||||
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return "", fmt.Errorf("%s%s", stderr, err)
|
return nil, fmt.Errorf("%s%s", stderr, err)
|
||||||
}
|
}
|
||||||
|
|
||||||
line := strings.Split(stdout, "\n")[0]
|
lines := strings.Split(stdout, "\n")
|
||||||
split := strings.Split(line, "-")
|
pkgdests := make(map[string]string)
|
||||||
|
|
||||||
|
for _, line := range lines {
|
||||||
|
if line == "" {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
|
||||||
|
fileName := filepath.Base(line)
|
||||||
|
split := strings.Split(fileName, "-")
|
||||||
|
|
||||||
if len(split) < 4 {
|
if len(split) < 4 {
|
||||||
return "", fmt.Errorf("Can not parse version from: %s", split)
|
return nil, fmt.Errorf("Can not find package name : %s", split)
|
||||||
}
|
}
|
||||||
//pkg-name-pkgver-pkgrel-arch: extract pkgver-pkgrel
|
|
||||||
ver := split[len(split)-3] + "-" + split[len(split)-2]
|
// pkgname-pkgver-pkgrel-arch.pkgext
|
||||||
return ver, nil
|
// This assumes 3 dashes after the pkgname, Will cause an error
|
||||||
|
// if the PKGEXT contains a dash. Please no one do that.
|
||||||
|
pkgname := strings.Join(split[:len(split)-3], "-")
|
||||||
|
pkgdests[pkgname] = line
|
||||||
|
}
|
||||||
|
|
||||||
|
return pkgdests, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func cleanEditNumberMenu(pkgs []*rpc.Pkg, bases map[string][]*rpc.Pkg, installed stringSet) ([]*rpc.Pkg, []*rpc.Pkg, error) {
|
func cleanEditNumberMenu(pkgs []*rpc.Pkg, bases map[string][]*rpc.Pkg, installed stringSet) ([]*rpc.Pkg, []*rpc.Pkg, error) {
|
||||||
|
@ -571,11 +585,6 @@ func downloadPkgBuildsSources(pkgs []*rpc.Pkg, bases map[string][]*rpc.Pkg, inco
|
||||||
}
|
}
|
||||||
|
|
||||||
func buildInstallPkgBuilds(dp *depPool, do *depOrder, srcinfos map[string]*gopkg.PKGBUILD, parser *arguments, incompatible stringSet) error {
|
func buildInstallPkgBuilds(dp *depPool, do *depOrder, srcinfos map[string]*gopkg.PKGBUILD, parser *arguments, incompatible stringSet) error {
|
||||||
arch, err := alpmHandle.Arch()
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
|
|
||||||
for _, pkg := range do.Aur {
|
for _, pkg := range do.Aur {
|
||||||
dir := filepath.Join(config.BuildDir, pkg.PackageBase)
|
dir := filepath.Join(config.BuildDir, pkg.PackageBase)
|
||||||
built := true
|
built := true
|
||||||
|
@ -594,27 +603,23 @@ func buildInstallPkgBuilds(dp *depPool, do *depOrder, srcinfos map[string]*gopkg
|
||||||
return fmt.Errorf("Error making: %s", pkg.Name)
|
return fmt.Errorf("Error making: %s", pkg.Name)
|
||||||
}
|
}
|
||||||
|
|
||||||
version, err := getVersionFromPkgbuild(dir)
|
pkgdests, err := parsePackageList(dir)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
if config.ReBuild == "no" || (config.ReBuild == "yes" && !dp.Explicit.get(pkg.Name)) {
|
if config.ReBuild == "no" || (config.ReBuild == "yes" && !dp.Explicit.get(pkg.Name)) {
|
||||||
for _, split := range do.Bases[pkg.PackageBase] {
|
for _, split := range do.Bases[pkg.PackageBase] {
|
||||||
file, err := completeFileName(dir, split.Name+"-"+version+"-"+arch+".pkg")
|
pkgdest, ok := pkgdests[split.Name]
|
||||||
if err != nil {
|
if !ok {
|
||||||
return err
|
return fmt.Errorf("Could not find PKGDEST for: %s", split.Name)
|
||||||
}
|
}
|
||||||
|
|
||||||
if file == "" {
|
_, err := os.Stat(pkgdest)
|
||||||
file, err = completeFileName(dir, split.Name+"-"+version+"-"+"any"+".pkg")
|
if os.IsNotExist(err) {
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if file == "" {
|
|
||||||
built = false
|
built = false
|
||||||
|
} else if err != nil {
|
||||||
|
return err
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
|
@ -665,23 +670,12 @@ func buildInstallPkgBuilds(dp *depPool, do *depOrder, srcinfos map[string]*gopkg
|
||||||
localNamesCache := sliceToStringSet(localNames)
|
localNamesCache := sliceToStringSet(localNames)
|
||||||
|
|
||||||
for _, split := range do.Bases[pkg.PackageBase] {
|
for _, split := range do.Bases[pkg.PackageBase] {
|
||||||
file, err := completeFileName(dir, split.Name+"-"+version+"-"+arch+".pkg")
|
pkgdest, ok := pkgdests[split.Name]
|
||||||
if err != nil {
|
if !ok {
|
||||||
return err
|
return fmt.Errorf("Could not find PKGDEST for: %s", split.Name)
|
||||||
}
|
}
|
||||||
|
|
||||||
if file == "" {
|
arguments.addTarget(pkgdest)
|
||||||
file, err = completeFileName(dir, split.Name+"-"+version+"-"+"any"+".pkg")
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if file == "" {
|
|
||||||
return fmt.Errorf("Could not find built package " + split.Name + "-" + version + "-" + arch + ".pkg")
|
|
||||||
}
|
|
||||||
|
|
||||||
arguments.addTarget(file)
|
|
||||||
if !dp.Explicit.get(split.Name) && !localNamesCache.get(split.Name) && !remoteNamesCache.get(split.Name) {
|
if !dp.Explicit.get(split.Name) && !localNamesCache.get(split.Name) && !remoteNamesCache.get(split.Name) {
|
||||||
depArguments.addTarget(split.Name)
|
depArguments.addTarget(split.Name)
|
||||||
}
|
}
|
||||||
|
|
22
utils.go
22
utils.go
|
@ -1,9 +1,6 @@
|
||||||
package main
|
package main
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"io/ioutil"
|
|
||||||
"path/filepath"
|
|
||||||
"strings"
|
|
||||||
"unicode"
|
"unicode"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
@ -59,25 +56,6 @@ func (mss mapStringSet) Add(n string, v string) {
|
||||||
mss[n].set(v)
|
mss[n].set(v)
|
||||||
}
|
}
|
||||||
|
|
||||||
func completeFileName(dir, name string) (string, error) {
|
|
||||||
files, err := ioutil.ReadDir(dir)
|
|
||||||
if err != nil {
|
|
||||||
return "", err
|
|
||||||
}
|
|
||||||
|
|
||||||
for _, file := range files {
|
|
||||||
if file.IsDir() {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
|
|
||||||
if strings.HasPrefix(file.Name(), name) {
|
|
||||||
return filepath.Join(dir, file.Name()), nil
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return "", nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func lessRunes(iRunes, jRunes []rune) bool {
|
func lessRunes(iRunes, jRunes []rune) bool {
|
||||||
max := len(iRunes)
|
max := len(iRunes)
|
||||||
if max > len(jRunes) {
|
if max > len(jRunes) {
|
||||||
|
|
Loading…
Reference in a new issue