diff options
| -rw-r--r-- | argv.template.go | 3 | ||||
| -rw-r--r-- | exit.go | 3 | ||||
| -rw-r--r-- | findNext.go | 3 | ||||
| -rw-r--r-- | main.go | 13 | ||||
| -rw-r--r-- | prepareRelease.go | 3 | ||||
| -rw-r--r-- | releaseBox.go | 3 |
6 files changed, 21 insertions, 7 deletions
diff --git a/argv.template.go b/argv.template.go index e7a9948..1808722 100644 --- a/argv.template.go +++ b/argv.template.go @@ -10,6 +10,7 @@ import ( "go.wit.com/dev/alexflint/arg" "go.wit.com/gui" + "go.wit.com/lib/ENV" "go.wit.com/lib/fhelp" "go.wit.com/log" ) @@ -63,7 +64,7 @@ func (args) InitGui() error { func (args) Exit() { gui.UnloadToolkits() - if me.argv.Verbose() { + if ENV.Verbose() { log.Info("argv.Exit() called", APPNAME+".Exit()") } // remove this from the template for your app (or make one for youself if you need it) @@ -1,6 +1,7 @@ package main import ( + "go.wit.com/lib/ENV" "go.wit.com/log" ) @@ -11,6 +12,6 @@ func okExit(thing string) { } func badExit(err error) { - log.Info("forge failed: ", err, me.forge.Config.ReposDir) + log.Info("forge failed: ", err, ENV.Get("gopath")) me.argv.BadExit("guireleaser", err) } diff --git a/findNext.go b/findNext.go index 6147115..261e47c 100644 --- a/findNext.go +++ b/findNext.go @@ -8,6 +8,7 @@ import ( "go.wit.com/log" + "go.wit.com/lib/ENV" "go.wit.com/lib/protobuf/gitpb" ) @@ -156,7 +157,7 @@ func testGoDepsCheckOk(godeps *gitpb.GoDeps, verbose bool) error { all := godeps.SortByGoPath() for all.Scan() { depRepo := all.Next() - fullpath := filepath.Join(me.forge.Config.ReposDir, depRepo.GoPath) + fullpath := filepath.Join(ENV.Get("gopath"), depRepo.GoPath) found := me.found.FindByFullPath(fullpath) if found == nil { continue @@ -8,6 +8,7 @@ import ( "path/filepath" "time" + "go.wit.com/lib/ENV" "go.wit.com/lib/fhelp" "go.wit.com/lib/gadgets" "go.wit.com/lib/gui/shell" @@ -30,7 +31,7 @@ func main() { fhelp.CheckGoModCleanExit() // me.forge.ConfigPrintTable() - os.Setenv("REPO_WORK_PATH", me.forge.Config.ReposDir) + os.Setenv("REPO_WORK_PATH", ENV.Get("gopath")) // save the ENV var here me.releaseReasonS = os.Getenv("GUIRELEASE_REASON") @@ -81,7 +82,15 @@ func main() { me.Disable() // todo: add this to forgepb - me.startRepo = me.forge.FindWorkingDirRepo() + // me.startRepo = me.forge.FindWorkingDirRepo() + wd, err := os.Getwd() + if err != nil { + me.argv.BadExit("your current directory does not exist err=", err) + } + me.startRepo, err = gitpb.NewRepo(wd) + if err != nil { + me.argv.BadExit("is this really a .git directory? err=", err) + } if _, count, _, err := me.forge.IsEverythingOnMaster(); err != nil { log.Info("not everything is on the master branch (", count, "repos)") diff --git a/prepareRelease.go b/prepareRelease.go index b669879..1522183 100644 --- a/prepareRelease.go +++ b/prepareRelease.go @@ -7,6 +7,7 @@ import ( "path/filepath" "time" + "go.wit.com/lib/ENV" "go.wit.com/lib/gui/shell" "go.wit.com/lib/protobuf/gitpb" "go.wit.com/log" @@ -89,7 +90,7 @@ func rillRestore(repo *gitpb.Repo) error { } func rePrepareRelease() { - me.forge.ScanRepoDir() // looks for new dirs, checks existing repos for changes + me.forge.ScanRepoDir(ENV.Get("gopath")) // looks for new dirs, checks existing repos for changes me.found = new(gitpb.Repos) me.reason = make(map[*gitpb.Repo]string) // stores the reason repos need to be versioned & released diff --git a/releaseBox.go b/releaseBox.go index 97aaa89..bfd4e6a 100644 --- a/releaseBox.go +++ b/releaseBox.go @@ -8,6 +8,7 @@ import ( "go.wit.com/gui" "go.wit.com/log" + "go.wit.com/lib/ENV" "go.wit.com/lib/gadgets" "go.wit.com/lib/gui/shell" "go.wit.com/lib/protobuf/forgepb" @@ -104,7 +105,7 @@ func createReleaseBox(box *gui.Node) { me.release.grid.NextRow() // me.userHomePwd.SetText(homeDir) - me.goSrcPwd.SetText(me.forge.Config.ReposDir) + me.goSrcPwd.SetText(ENV.Get("gopath")) group := me.release.box.NewGroup("Run on Current Repo") grid := group.NewGrid("buildOptions", 0, 0) |