mirror/yay
0
0
Fork 0
mirror of https://github.com/Jguer/yay.git synced 2024-11-06 09:07:21 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Random fixups

Browse Source
This commit is contained in:
morganamilo 2019-04-23 17:03:09 +01:00
parent 112046853b
commit 6415c23be2
No known key found for this signature in database
GPG Key ID: 6FE9E7996B0B082E
3 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
download.go
View File

@ -99,12 +99,6 @@ func gitMerge(path string, name string) error {
return nil
}
func gitDiff(path string, name string) error {
err := show(passToGit(filepath.Join(path, name), "diff", "HEAD..HEAD@{upstream}"))
return err
}
// DownloadAndUnpack downloads url tgz and extracts to path.
func downloadAndUnpack(url string, path string) error {
err := os.MkdirAll(path, 0755)
@ -140,6 +134,10 @@ func getPkgbuilds(pkgs []string) error {
pkgs = removeInvalidTargets(pkgs)
aur, repo, err := packageSlices(pkgs)
if err != nil {
return err
}
for n := range aur {
_, pkg := splitDBFromName(aur[n])
aur[n] = pkg

4
exec.go
View File

@ -98,10 +98,6 @@ func passToPacman(args *arguments) *exec.Cmd {
}
func passToMakepkg(dir string, args ...string) *exec.Cmd {
if config.NoConfirm {
args = append(args)
}
mflags := strings.Fields(config.MFlags)
args = append(args, mflags...)

2
keys.go
View File

@ -114,7 +114,7 @@ func formatKeysToImport(keys pgpKeySet) (string, error) {
for _, base := range bases {
pkglist += base.String() + " "
}
pkglist = strings.TrimRight(pkglist, " ")
pkglist = strings.TrimRight(pkglist, " ")
buffer.WriteString(fmt.Sprintf("\n%s %s, required by: %s", yellow(bold(smallArrow)), cyan(key), cyan(pkglist)))
}
return buffer.String(), nil