Merge pull request #412 from Morganamilo/typos

Fix typos
This commit is contained in:
Anna 2018-05-12 17:17:36 +01:00 committed by GitHub
commit 9437bf1576
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 17 additions and 17 deletions

View file

@ -51,7 +51,7 @@ Otherwise send us a pull request and we will be happy to review it.
### Code Style
All code should be formated through `go fmt`. This tool will automatically
All code should be formatted through `go fmt`. This tool will automatically
format code for you. Although it is recommended you write code in this style
and just use this tool to catch mistakes.
@ -66,7 +66,7 @@ directory as the Makefile.
Run `make test` to test Yay. This will check the code is formatted correctly,
run the code through `go vet` and run unit tests.
Yay's Makefile automaticly sets the `GOPATH` to `$PWD/.go`. This makes it easy to
Yay's Makefile automatically sets the `GOPATH` to `$PWD/.go`. This makes it easy to
build using the dependencies in `vendor/`. Running manual go commands such as
`go build` will require that you to either set the `GOPATH` manually or `go get`
The dependencies into your own `GOPATH`.
@ -74,7 +74,7 @@ The dependencies into your own `GOPATH`.
### Vendored Dependencies
Yay depends on a couple of other projects. These are stored in `vendor/` and
are built into Yay at build time. They do not need to be installed seperatly.
are built into Yay at build time. They do not need to be installed separately.
Currently yay Depends on:

View file

@ -124,7 +124,7 @@ func cleanAUR(keepInstalled, keepCurrent, removeAll bool) error {
// Most people probably don't use keep current and that is the only
// case where this is needed.
// Querying the AUR is slow and needs internet so dont do it if we
// Querying the AUR is slow and needs internet so don't do it if we
// don't need to.
if keepCurrent {
info, err := aurInfo(cachedPackages, &aurWarnings{})

View file

@ -224,7 +224,7 @@ func checkConflict(name string, conflict string, conflicts mapStringSet) error {
return nil
}
// Provides arent version unless explicitly defined as
// Provides aren't version unless explicitly defined as
// such. If a conflict is versioned but a provide is
// not it can not conflict.
if (dep.MaxVer != nil || dep.MinVer != nil) && provide.Mod == alpm.DepModAny {

View file

@ -311,7 +311,7 @@ func depCatagoriesRecursive(_pkg *rpc.Pkg, dc *depCatagories, dt *depTree, isMak
//
// Here is a visual expample of the request system.
// Remember only unsatisfied packages are requested, if a package is already
// installed we dont bother.
// installed we don't bother.
//
// a
// / \
@ -323,7 +323,7 @@ func depCatagoriesRecursive(_pkg *rpc.Pkg, dc *depCatagories, dt *depTree, isMak
// We see a wants b and c so we send a request for b and c
// We see d and e so we send a request for d and e
//
// Thats 5 packages in 3 requests. The amount of requests needed should always be
// That's 5 packages in 3 requests. The amount of requests needed should always be
// the same as the height of the tree.
// The example does not really do this justice, In the real world where packages
// have 10+ dependencies each this is a very nice optimization.
@ -366,8 +366,8 @@ func getDepTree(pkgs []string, warnings *aurWarnings) (*depTree, error) {
continue
} else {
//would be better to check the groups from singleDb if
//the user specified a db but theres no easy way to do
//it without making alpm_lists so dont bother for now
//the user specified a db but there's no easy way to do
//it without making alpm_lists so don't bother for now
//db/group is probably a rare use case
_, err := syncDb.PkgCachebyGroup(name)

View file

@ -220,7 +220,7 @@ func main() {
cleanup:
//cleanup
//from here on out dont exit if an error occurs
//from here on out don't exit if an error occurs
//if we fail to save the configuration
//at least continue on and try clean up other parts

View file

@ -15,7 +15,7 @@ import (
// Other types of sets are used throughout the code but do not have
// their own typedef.
// String sets and <type>sets should be used throughout the code when applicable,
// they are a lot more flexable than slices and provide easy lookup.
// they are a lot more flexible than slices and provide easy lookup.
type stringSet map[string]struct{}
func (set stringSet) set(v string) {
@ -303,15 +303,15 @@ func (parser *arguments) formatArgs() (args []string) {
continue
}
formatedOption := formatArg(option)
args = append(args, formatedOption)
formattedOption := formatArg(option)
args = append(args, formattedOption)
if hasParam(option) {
args = append(args, arg)
}
if parser.existsDouble(option) {
args = append(args, formatedOption)
args = append(args, formattedOption)
}
}
@ -320,15 +320,15 @@ func (parser *arguments) formatArgs() (args []string) {
func (parser *arguments) formatGlobals() (args []string) {
for option, arg := range parser.globals {
formatedOption := formatArg(option)
args = append(args, formatedOption)
formattedOption := formatArg(option)
args = append(args, formattedOption)
if hasParam(option) {
args = append(args, arg)
}
if parser.existsDouble(option) {
args = append(args, formatedOption)
args = append(args, formattedOption)
}
}