sharpetronics/yay
1
0
Fork 0
mirror of https://github.com/Jguer/yay.git synced 2025-12-07 00:03:15 -05:00
Code Issues Projects Releases Wiki Activity

go fmt

Browse Source
This commit is contained in:
morganamilo 2018-02-21 08:41:25 +00:00
parent 31d6a95c2a
commit 4ef282c54e
No known key found for this signature in database
GPG Key ID: 6FE9E7996B0B082E
6 changed files with 44 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dependencies.go
View File

@ -1,9 +1,9 @@
package main package main
import ( import (
"strings"
alpm "github.com/jguer/go-alpm" alpm "github.com/jguer/go-alpm"
rpc "github.com/mikkeloscar/aur" rpc "github.com/mikkeloscar/aur"
"strings"
) )
type depTree struct { type depTree struct {

4
download.go
View File

@ -61,7 +61,7 @@ func downloadAndUnpack(url string, path string, trim bool) (err error) {
return return
} }
func getPkgbuilds(pkgs []string) (error) { func getPkgbuilds(pkgs []string) error {
//possibleAurs := make([]string, 0, 0) //possibleAurs := make([]string, 0, 0)
wd, err := os.Getwd() wd, err := os.Getwd()
if err != nil { if err != nil {
@ -85,7 +85,7 @@ func getPkgbuildsfromABS(pkgs []string, path string) (missing []string, err erro
return return
} }
nextPkg: nextPkg:
for _, pkgN := range pkgs { for _, pkgN := range pkgs {
for _, db := range dbList.Slice() { for _, db := range dbList.Slice() {
pkg, err := db.PkgByName(pkgN) pkg, err := db.PkgByName(pkgN)

12
install.go
View File

@ -5,8 +5,8 @@ import (
"io/ioutil" "io/ioutil"
"os" "os"
"os/exec" "os/exec"
"strings"
"strconv" "strconv"
"strings"
alpm "github.com/jguer/go-alpm" alpm "github.com/jguer/go-alpm"
rpc "github.com/mikkeloscar/aur" 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 { if len(aur) > 0 || parser.existsArg("u", "sysupgrade") && len(remoteNames) > 0 {
fmt.Println(boldCyanFg("::"), boldFg("Querying AUR...")) fmt.Println(boldCyanFg("::"), boldFg("Querying AUR..."))
} }
dt , err := getDepTree(requestTargets) dt, err := getDepTree(requestTargets)
if err != nil { if err != nil {
return err return err
} }
@ -81,7 +81,6 @@ func install(parser *arguments) error {
arguments.addTarget(pkg) arguments.addTarget(pkg)
} }
//discard stuff thats //discard stuff thats
//not a target and //not a target and
//not an upgrade and //not an upgrade and
@ -112,7 +111,6 @@ func install(parser *arguments) error {
return nil return nil
} }
if hasAur { if hasAur {
printDepCatagories(dc) printDepCatagories(dc)
fmt.Println() fmt.Println()
@ -143,7 +141,6 @@ func install(parser *arguments) error {
uask := alpm.Question(ask) | alpm.QuestionConflictPkg uask := alpm.Question(ask) | alpm.QuestionConflictPkg
cmdArgs.globals["ask"] = fmt.Sprint(uask) cmdArgs.globals["ask"] = fmt.Sprint(uask)
askCleanBuilds(dc.Aur, dc.Bases) askCleanBuilds(dc.Aur, dc.Bases)
// if !continueTask("Proceed with download?", "nN") { // if !continueTask("Proceed with download?", "nN") {
@ -194,8 +191,7 @@ func install(parser *arguments) error {
return err return err
} }
fmt.Println(boldGreenFg(arrow + " GenDB finished. No packages were installed"))
fmt.Println(boldGreenFg(arrow+" GenDB finished. No packages were installed"))
return nil return nil
} }
@ -204,7 +200,6 @@ func install(parser *arguments) error {
return err return err
} }
err = parsesrcinfosGenerate(dc.Aur, srcinfos, dc.Bases) err = parsesrcinfosGenerate(dc.Aur, srcinfos, dc.Bases)
if err != nil { if err != nil {
return err 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") str := boldCyanFg("::") + boldFg(" Parsing SRCINFO (%d/%d): %s\n")
fmt.Printf(str, k+1, len(pkgs), formatPkgbase(pkg, bases)) fmt.Printf(str, k+1, len(pkgs), formatPkgbase(pkg, bases))
pkgbuild, err := gopkg.ParseSRCINFO(dir + ".SRCINFO") pkgbuild, err := gopkg.ParseSRCINFO(dir + ".SRCINFO")
if err != nil { if err != nil {
return fmt.Errorf("%s: %s", pkg.Name, err) return fmt.Errorf("%s: %s", pkg.Name, err)

1
print.go
View File

@ -109,7 +109,6 @@ func formatPkgbase(pkg *rpc.Pkg, bases map[string][]*rpc.Pkg) string {
return str return str
} }
// printDownloadsFromRepo prints repository packages to be downloaded // printDownloadsFromRepo prints repository packages to be downloaded
func printDepCatagories(dc *depCatagories) { func printDepCatagories(dc *depCatagories) {
repo := "" repo := ""

2
query.go
View File

@ -394,7 +394,7 @@ func aurInfo(names []string) ([]rpc.Pkg, error) {
} }
for n := 0; n < len(names); n += config.RequestSplitN { 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) wg.Add(1)
go makeRequest(n, max) go makeRequest(n, max)
} }

3
upgrade.go
View File

@ -169,7 +169,7 @@ func upDevel(remote []alpm.Package, packageC chan upgrade, done chan bool) {
fmt.Print(yellowFg("Warning: ")) fmt.Print(yellowFg("Warning: "))
fmt.Printf("%s ignoring package upgrade (%s => %s)\n", pkg.Name(), pkg.Version(), "git") fmt.Printf("%s ignoring package upgrade (%s => %s)\n", pkg.Name(), pkg.Version(), "git")
} else { } 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 { } else {
removeVCSPackage([]string{e.Package}) removeVCSPackage([]string{e.Package})
@ -370,7 +370,6 @@ func upgradePkgs(dt *depTree) (stringSet, stringSet, error) {
repoNums = removeIntListFromList(excludeRepo, repoNums) repoNums = removeIntListFromList(excludeRepo, repoNums)
} }
if len(repoUp) != 0 { if len(repoUp) != 0 {
repoloop: repoloop:
for i, k := range repoUp { for i, k := range repoUp {