diff --git a/callbacks.go b/callbacks.go index 2c7bba1..1b55a0f 100644 --- a/callbacks.go +++ b/callbacks.go @@ -25,7 +25,7 @@ func questionCallback(question alpm.QuestionAny) { }) fmt.Print(bold(cyan(":: "))) - str := bold(fmt.Sprintf(bold("There are %d providers avalable for %s:"), size, qp.Dep())) + str := bold(fmt.Sprintf(bold("There are %d providers available for %s:"), size, qp.Dep())) size = 1 var db string diff --git a/cmd.go b/cmd.go index 9b33bb9..b7a0d27 100644 --- a/cmd.go +++ b/cmd.go @@ -199,14 +199,14 @@ func handleHelp() error { if cmdArgs.op == "Y" || cmdArgs.op == "yay" { usage() return nil - } else { - return passToPacman(cmdArgs) } + + return passToPacman(cmdArgs) } //this function should only set config options //but currently still uses the switch left over from old code -//eventually this should be refactored out futher +//eventually this should be refactored out further //my current plan is to have yay specific operations in its own operator //e.g. yay -Y --gendb //e.g yay -Yg diff --git a/dependencies.go b/dependencies.go index c19dd26..31bc0e0 100644 --- a/dependencies.go +++ b/dependencies.go @@ -301,7 +301,7 @@ func depCatagoriesRecursive(_pkg *rpc.Pkg, dc *depCatagories, dt *depTree, isMak // // For Aur dependencies depends, makedepends and checkdepends are resolved but // for repo packages only depends are resolved as they are prebuilt. -// The return will be split into three catagories: Repo, Aur and Missing. +// The return will be split into three categories: Repo, Aur and Missing. // The return is in no way ordered. This step is is just aimed at gathering the // packages we need. // diff --git a/install.go b/install.go index 05bc1d1..9dabec7 100644 --- a/install.go +++ b/install.go @@ -566,12 +566,12 @@ func downloadPkgBuilds(pkgs []*rpc.Pkg, targets stringSet, bases map[string][]*r return nil } -func downloadPkgBuildsSources(pkgs []*rpc.Pkg, bases map[string][]*rpc.Pkg, incompatable stringSet) (err error) { +func downloadPkgBuildsSources(pkgs []*rpc.Pkg, bases map[string][]*rpc.Pkg, incompatible stringSet) (err error) { for _, pkg := range pkgs { dir := filepath.Join(config.BuildDir, pkg.PackageBase) args := []string{"--verifysource", "-Ccf"} - if incompatable.get(pkg.PackageBase) { + if incompatible.get(pkg.PackageBase) { args = append(args, "--ignorearch") } @@ -584,7 +584,7 @@ func downloadPkgBuildsSources(pkgs []*rpc.Pkg, bases map[string][]*rpc.Pkg, inco return } -func buildInstallPkgBuilds(pkgs []*rpc.Pkg, srcinfos map[string]*gopkg.PKGBUILD, targets stringSet, parser *arguments, bases map[string][]*rpc.Pkg, incompatable stringSet) error { +func buildInstallPkgBuilds(pkgs []*rpc.Pkg, srcinfos map[string]*gopkg.PKGBUILD, targets stringSet, parser *arguments, bases map[string][]*rpc.Pkg, incompatible stringSet) error { arch, err := alpmHandle.Arch() if err != nil { return err @@ -635,7 +635,7 @@ func buildInstallPkgBuilds(pkgs []*rpc.Pkg, srcinfos map[string]*gopkg.PKGBUILD, } else { args := []string{"-Ccf", "--noconfirm"} - if incompatable.get(pkg.PackageBase) { + if incompatible.get(pkg.PackageBase) { args = append(args, "--ignorearch") } diff --git a/keys_test.go b/keys_test.go index a896e96..f42941b 100644 --- a/keys_test.go +++ b/keys_test.go @@ -150,7 +150,7 @@ func TestCheckPgpKeys(t *testing.T) { // 487EACC08557AD082088DABA1EB2638FF56C0C53: Dave Reisner. { pkgs: []*rpc.Pkg{newPkg("cower")}, - srcinfos: map[string]*gopkg.PKGBUILD{"cower": &gopkg.PKGBUILD{Pkgbase: "cower", Validpgpkeys: []string{"487EACC08557AD082088DABA1EB2638FF56C0C53"}}}, + srcinfos: map[string]*gopkg.PKGBUILD{"cower": {Pkgbase: "cower", Validpgpkeys: []string{"487EACC08557AD082088DABA1EB2638FF56C0C53"}}}, bases: map[string][]*rpc.Pkg{"cower": {newPkg("cower")}}, wantError: false, }, @@ -159,7 +159,7 @@ func TestCheckPgpKeys(t *testing.T) { // B6C8F98282B944E3B0D5C2530FC3042E345AD05D: Hans Wennborg. { pkgs: []*rpc.Pkg{newPkg("libc++")}, - srcinfos: map[string]*gopkg.PKGBUILD{"libc++": &gopkg.PKGBUILD{Pkgbase: "libc++", Validpgpkeys: []string{"11E521D646982372EB577A1F8F0871F202119294", "B6C8F98282B944E3B0D5C2530FC3042E345AD05D"}}}, + srcinfos: map[string]*gopkg.PKGBUILD{"libc++": {Pkgbase: "libc++", Validpgpkeys: []string{"11E521D646982372EB577A1F8F0871F202119294", "B6C8F98282B944E3B0D5C2530FC3042E345AD05D"}}}, bases: map[string][]*rpc.Pkg{"libc++": {newPkg("libc++")}}, wantError: false, }, @@ -167,7 +167,7 @@ func TestCheckPgpKeys(t *testing.T) { // ABAF11C65A2970B130ABE3C479BE3E4300411886: Linus Torvalds. { pkgs: []*rpc.Pkg{newPkg("dummy-1"), newPkg("dummy-2")}, - srcinfos: map[string]*gopkg.PKGBUILD{"dummy-1": &gopkg.PKGBUILD{Pkgbase: "dummy-1", Validpgpkeys: []string{"ABAF11C65A2970B130ABE3C479BE3E4300411886"}}, "dummy-2": &gopkg.PKGBUILD{Pkgbase: "dummy-2", Validpgpkeys: []string{"ABAF11C65A2970B130ABE3C479BE3E4300411886"}}}, + srcinfos: map[string]*gopkg.PKGBUILD{"dummy-1": {Pkgbase: "dummy-1", Validpgpkeys: []string{"ABAF11C65A2970B130ABE3C479BE3E4300411886"}}, "dummy-2": {Pkgbase: "dummy-2", Validpgpkeys: []string{"ABAF11C65A2970B130ABE3C479BE3E4300411886"}}}, bases: map[string][]*rpc.Pkg{"dummy-1": {newPkg("dummy-1")}, "dummy-2": {newPkg("dummy-2")}}, wantError: false, }, @@ -177,21 +177,21 @@ func TestCheckPgpKeys(t *testing.T) { // C52048C0C0748FEE227D47A2702353E0F7E48EDB: Thomas Dickey. { pkgs: []*rpc.Pkg{newPkg("dummy-3")}, - srcinfos: map[string]*gopkg.PKGBUILD{"dummy-3": &gopkg.PKGBUILD{Pkgbase: "dummy-3", Validpgpkeys: []string{"11E521D646982372EB577A1F8F0871F202119294", "C52048C0C0748FEE227D47A2702353E0F7E48EDB"}}}, + srcinfos: map[string]*gopkg.PKGBUILD{"dummy-3": {Pkgbase: "dummy-3", Validpgpkeys: []string{"11E521D646982372EB577A1F8F0871F202119294", "C52048C0C0748FEE227D47A2702353E0F7E48EDB"}}}, bases: map[string][]*rpc.Pkg{"dummy-3": {newPkg("dummy-3")}}, wantError: false, }, // Two dummy packages with existing keys. { pkgs: []*rpc.Pkg{newPkg("dummy-4"), newPkg("dummy-5")}, - srcinfos: map[string]*gopkg.PKGBUILD{"dummy-4": &gopkg.PKGBUILD{Pkgbase: "dummy-4", Validpgpkeys: []string{"11E521D646982372EB577A1F8F0871F202119294"}}, "dummy-5": &gopkg.PKGBUILD{Pkgbase: "dummy-5", Validpgpkeys: []string{"C52048C0C0748FEE227D47A2702353E0F7E48EDB"}}}, + srcinfos: map[string]*gopkg.PKGBUILD{"dummy-4": {Pkgbase: "dummy-4", Validpgpkeys: []string{"11E521D646982372EB577A1F8F0871F202119294"}}, "dummy-5": {Pkgbase: "dummy-5", Validpgpkeys: []string{"C52048C0C0748FEE227D47A2702353E0F7E48EDB"}}}, bases: map[string][]*rpc.Pkg{"dummy-4": {newPkg("dummy-4")}, "dummy-5": {newPkg("dummy-5")}}, wantError: false, }, // Dummy package with invalid key, should fail. { pkgs: []*rpc.Pkg{newPkg("dummy-7")}, - srcinfos: map[string]*gopkg.PKGBUILD{"dummy-7": &gopkg.PKGBUILD{Pkgbase: "dummy-7", Validpgpkeys: []string{"THIS-SHOULD-FAIL"}}}, + srcinfos: map[string]*gopkg.PKGBUILD{"dummy-7": {Pkgbase: "dummy-7", Validpgpkeys: []string{"THIS-SHOULD-FAIL"}}}, bases: map[string][]*rpc.Pkg{"dummy-7": {newPkg("dummy-7")}}, wantError: true, }, @@ -199,7 +199,7 @@ func TestCheckPgpKeys(t *testing.T) { // A314827C4E4250A204CE6E13284FC34C8E4B1A25: Thomas Bächler. { pkgs: []*rpc.Pkg{newPkg("dummy-8")}, - srcinfos: map[string]*gopkg.PKGBUILD{"dummy-8": &gopkg.PKGBUILD{Pkgbase: "dummy-8", Validpgpkeys: []string{"A314827C4E4250A204CE6E13284FC34C8E4B1A25", "THIS-SHOULD-FAIL"}}}, + srcinfos: map[string]*gopkg.PKGBUILD{"dummy-8": {Pkgbase: "dummy-8", Validpgpkeys: []string{"A314827C4E4250A204CE6E13284FC34C8E4B1A25", "THIS-SHOULD-FAIL"}}}, bases: map[string][]*rpc.Pkg{"dummy-8": {newPkg("dummy-8")}}, wantError: true, }, diff --git a/main.go b/main.go index b69b44c..0d47d24 100644 --- a/main.go +++ b/main.go @@ -148,7 +148,7 @@ func initAlpm() (err error) { return } - value, _, exists = cmdArgs.getArg("color") + value, _, _ = cmdArgs.getArg("color") if value == "always" || value == "auto" { useColor = true } else if value == "never" { diff --git a/parser.go b/parser.go index 08013e4..9957cb5 100644 --- a/parser.go +++ b/parser.go @@ -246,6 +246,7 @@ func (parser *arguments) getArg(options ...string) (arg string, double bool, exi } double = existCount >= 2 + exists = existCount >= 1 return } @@ -613,7 +614,7 @@ func (parser *arguments) parseCommandLine() (err error) { //supports negation: ^1 ^1-4 // //include and excule holds numbers that should be added and should not be added -//respectively. other holds anythign that can't be parsed as an int. This is +//respectively. other holds anything that can't be parsed as an int. This is //intended to allow words inside of number menus. e.g. 'all' 'none' 'abort' //of course the implementation is up to the caller, this function mearley parses //the input and organizes it diff --git a/upgrade.go b/upgrade.go index c75b450..a933bb9 100644 --- a/upgrade.go +++ b/upgrade.go @@ -117,8 +117,8 @@ func getVersionDiff(oldVersion, newversion string) (left, right string) { samePart := oldVersion[0:diffPosition] - left = samePart + red(oldVersion[diffPosition:len(oldVersion)]) - right = samePart + green(newVersion[diffPosition:len(newVersion)]) + left = samePart + red(oldVersion[diffPosition:]) + right = samePart + green(newVersion[diffPosition:]) } return diff --git a/vcs.go b/vcs.go index c38dfcb..c091efd 100644 --- a/vcs.go +++ b/vcs.go @@ -152,11 +152,14 @@ func getCommit(url string, branch string, protocols []string) string { err = cmd.Wait() timer.Stop() - if err != nil { continue } + err = cmd.Run() + if err != nil { + continue + } stdout := outbuf.String() split := strings.Fields(stdout)