diff --git a/callbacks.go b/callbacks.go index 2c7bba1c..1b55a0f6 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 4c96b877..b7a0d274 100644 --- a/cmd.go +++ b/cmd.go @@ -206,7 +206,7 @@ func handleHelp() error { //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 c19dd26f..31bc0e07 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 05bc1d1d..9dabec70 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/parser.go b/parser.go index 08013e4f..9fab121e 100644 --- a/parser.go +++ b/parser.go @@ -613,7 +613,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