mirror of
https://github.com/Jguer/yay.git
synced 2025-12-08 00:05:04 -05:00
go fmt
This commit is contained in:
parent
31d6a95c2a
commit
4ef282c54e
@ -1,9 +1,9 @@
|
||||
package main
|
||||
|
||||
import (
|
||||
"strings"
|
||||
alpm "github.com/jguer/go-alpm"
|
||||
rpc "github.com/mikkeloscar/aur"
|
||||
"strings"
|
||||
)
|
||||
|
||||
type depTree struct {
|
||||
|
||||
@ -61,7 +61,7 @@ func downloadAndUnpack(url string, path string, trim bool) (err error) {
|
||||
return
|
||||
}
|
||||
|
||||
func getPkgbuilds(pkgs []string) (error) {
|
||||
func getPkgbuilds(pkgs []string) error {
|
||||
//possibleAurs := make([]string, 0, 0)
|
||||
wd, err := os.Getwd()
|
||||
if err != nil {
|
||||
@ -85,7 +85,7 @@ func getPkgbuildsfromABS(pkgs []string, path string) (missing []string, err erro
|
||||
return
|
||||
}
|
||||
|
||||
nextPkg:
|
||||
nextPkg:
|
||||
for _, pkgN := range pkgs {
|
||||
for _, db := range dbList.Slice() {
|
||||
pkg, err := db.PkgByName(pkgN)
|
||||
|
||||
12
install.go
12
install.go
@ -5,8 +5,8 @@ import (
|
||||
"io/ioutil"
|
||||
"os"
|
||||
"os/exec"
|
||||
"strings"
|
||||
"strconv"
|
||||
"strings"
|
||||
|
||||
alpm "github.com/jguer/go-alpm"
|
||||
rpc "github.com/mikkeloscar/aur"
|
||||
@ -47,7 +47,7 @@ func install(parser *arguments) error {
|
||||
if len(aur) > 0 || parser.existsArg("u", "sysupgrade") && len(remoteNames) > 0 {
|
||||
fmt.Println(boldCyanFg("::"), boldFg("Querying AUR..."))
|
||||
}
|
||||
dt , err := getDepTree(requestTargets)
|
||||
dt, err := getDepTree(requestTargets)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
@ -81,7 +81,6 @@ func install(parser *arguments) error {
|
||||
arguments.addTarget(pkg)
|
||||
}
|
||||
|
||||
|
||||
//discard stuff thats
|
||||
//not a target and
|
||||
//not an upgrade and
|
||||
@ -112,7 +111,6 @@ func install(parser *arguments) error {
|
||||
return nil
|
||||
}
|
||||
|
||||
|
||||
if hasAur {
|
||||
printDepCatagories(dc)
|
||||
fmt.Println()
|
||||
@ -143,7 +141,6 @@ func install(parser *arguments) error {
|
||||
uask := alpm.Question(ask) | alpm.QuestionConflictPkg
|
||||
cmdArgs.globals["ask"] = fmt.Sprint(uask)
|
||||
|
||||
|
||||
askCleanBuilds(dc.Aur, dc.Bases)
|
||||
|
||||
// if !continueTask("Proceed with download?", "nN") {
|
||||
@ -194,8 +191,7 @@ func install(parser *arguments) error {
|
||||
return err
|
||||
}
|
||||
|
||||
|
||||
fmt.Println(boldGreenFg(arrow+" GenDB finished. No packages were installed"))
|
||||
fmt.Println(boldGreenFg(arrow + " GenDB finished. No packages were installed"))
|
||||
return nil
|
||||
}
|
||||
|
||||
@ -204,7 +200,6 @@ func install(parser *arguments) error {
|
||||
return err
|
||||
}
|
||||
|
||||
|
||||
err = parsesrcinfosGenerate(dc.Aur, srcinfos, dc.Bases)
|
||||
if err != nil {
|
||||
return err
|
||||
@ -354,7 +349,6 @@ func parsesrcinfosFile(pkgs []*rpc.Pkg, srcinfos map[string]*gopkg.PKGBUILD, bas
|
||||
str := boldCyanFg("::") + boldFg(" Parsing SRCINFO (%d/%d): %s\n")
|
||||
fmt.Printf(str, k+1, len(pkgs), formatPkgbase(pkg, bases))
|
||||
|
||||
|
||||
pkgbuild, err := gopkg.ParseSRCINFO(dir + ".SRCINFO")
|
||||
if err != nil {
|
||||
return fmt.Errorf("%s: %s", pkg.Name, err)
|
||||
|
||||
1
print.go
1
print.go
@ -109,7 +109,6 @@ func formatPkgbase(pkg *rpc.Pkg, bases map[string][]*rpc.Pkg) string {
|
||||
return str
|
||||
}
|
||||
|
||||
|
||||
// printDownloadsFromRepo prints repository packages to be downloaded
|
||||
func printDepCatagories(dc *depCatagories) {
|
||||
repo := ""
|
||||
|
||||
2
query.go
2
query.go
@ -394,7 +394,7 @@ func aurInfo(names []string) ([]rpc.Pkg, error) {
|
||||
}
|
||||
|
||||
for n := 0; n < len(names); n += config.RequestSplitN {
|
||||
max := min(len(names), n + config.RequestSplitN)
|
||||
max := min(len(names), n+config.RequestSplitN)
|
||||
wg.Add(1)
|
||||
go makeRequest(n, max)
|
||||
}
|
||||
|
||||
@ -169,7 +169,7 @@ func upDevel(remote []alpm.Package, packageC chan upgrade, done chan bool) {
|
||||
fmt.Print(yellowFg("Warning: "))
|
||||
fmt.Printf("%s ignoring package upgrade (%s => %s)\n", pkg.Name(), pkg.Version(), "git")
|
||||
} else {
|
||||
packageC <- upgrade{e.Package, "devel", pkg.Version() , "commit-" + e.SHA[0:6]}
|
||||
packageC <- upgrade{e.Package, "devel", pkg.Version(), "commit-" + e.SHA[0:6]}
|
||||
}
|
||||
} else {
|
||||
removeVCSPackage([]string{e.Package})
|
||||
@ -370,7 +370,6 @@ func upgradePkgs(dt *depTree) (stringSet, stringSet, error) {
|
||||
repoNums = removeIntListFromList(excludeRepo, repoNums)
|
||||
}
|
||||
|
||||
|
||||
if len(repoUp) != 0 {
|
||||
repoloop:
|
||||
for i, k := range repoUp {
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user