diff --git a/Makefile b/Makefile index 78a60fd..e20aa05 100644 --- a/Makefile +++ b/Makefile @@ -5,15 +5,11 @@ # go install -all: forgeConfig.pb.go - reset - make -C forgeConfig +all: forgeConfig.pb.go vet -vet: lint - GO111MODULE=off go vet - -lint: - -buf lint repo.proto +vet: + @GO111MODULE=off go vet + @echo this go library package builds okay # autofixes your import headers in your golang files goimports: @@ -31,6 +27,9 @@ clean: -rm -f go.* make -C forgeConfig clean +build: + make -C forgeConfig + install: make -C forgeConfig install diff --git a/forgeConfig/main.go b/forgeConfig/main.go index 8ca4bf9..36b0b71 100644 --- a/forgeConfig/main.go +++ b/forgeConfig/main.go @@ -25,7 +25,7 @@ func main() { // try to delete, then save config and exit if argv.Delete { - if oldr := f.Config.DeleteByGoPath(argv.GoPath); oldr == nil { + if f.Config.DeleteByGoPath(argv.GoPath) { log.Info("deleted", argv.GoPath, "did not exist. did nothing") os.Exit(0) } diff --git a/repoSettings.go b/repoSettings.go index 9b03ad1..66677f8 100644 --- a/repoSettings.go +++ b/repoSettings.go @@ -20,6 +20,7 @@ func (f *Forge) SortByGoPath() *ForgeConfigIterator { } */ +/* func (all *ForgeConfigs) UpdateGoPath(name string, gopath string) bool { oldr := all.DeleteByGoPath(name) if oldr == nil { @@ -31,6 +32,7 @@ func (all *ForgeConfigs) UpdateGoPath(name string, gopath string) bool { oldr.GoPath = gopath return all.Append(oldr) } +*/ // returns true if gopath is readonly() // will attempt to match IsWritable("foo") against anything ending in "foo"