diff options
| -rw-r--r-- | doNewUser.go | 2 | ||||
| -rw-r--r-- | doNormal.go | 2 | ||||
| -rw-r--r-- | main.go | 25 |
3 files changed, 4 insertions, 25 deletions
diff --git a/doNewUser.go b/doNewUser.go index f1ee259..7d504ce 100644 --- a/doNewUser.go +++ b/doNewUser.go @@ -43,7 +43,7 @@ func doNewUser() (string, error) { gosrc := filepath.Join(ENV.Get("homedir"), "go/src") s = fmt.Sprintf("Scan %s for .git repos", gosrc) if fhelp.QuestionUser(s) { - me.forge.ScanRepoDir(gosrc) // looks for new dirs, checks existing repos for changes + // me.forge.ScanRepoDir(gosrc) // looks for new dirs, checks existing repos for changes } else { // log.Info("question false") return "not scanned", errors.New("~/go/src not scanned") diff --git a/doNormal.go b/doNormal.go index d9aee18..cf6b64d 100644 --- a/doNormal.go +++ b/doNormal.go @@ -158,7 +158,7 @@ func checkNormalRepoState(repo *gitpb.Repo) error { var err error tmp := filepath.Join(ENV.Get("gopath"), repo.GetNamespace()) if tmp != repo.FullPath { - log.Infof("%s != %s\n", repo.FullPath, tmp) + log.Infof("checkNormalRepoState() %s != %s\n", repo.FullPath, tmp) if strings.HasPrefix(repo.FullPath, ENV.Get("gopath")) { tmp = strings.TrimPrefix(repo.FullPath, ENV.Get("gopath")) tmp = strings.Trim(tmp, "/") @@ -8,6 +8,7 @@ package main import ( "embed" + "go.wit.com/lib/ENV" "go.wit.com/lib/protobuf/argvpb" "go.wit.com/lib/protobuf/forgepb" "go.wit.com/log" @@ -18,29 +19,6 @@ import ( //go:embed resources/* var resources embed.FS -func doInit() *forgepb.Forge { - // the current forge init process - forge, err := forgepb.Init() - me.forge = forge - if err == nil { - // do the new user check anyway. should exit right away with no error - s, err := doNewUser() - if err != nil { - // fail if new user check fails - me.argv.BadExit(s, err) - } - return forge - } - - // Probably a new user - s, err := doNewUser() - if err != nil { - me.argv.BadExit(s, err) - } - me.argv.GoodExit("try running: 'forge rebuild forge' to test out that forge is working on your machine") - return forge -} - func doCoreChecks() { // ENV.PrintTable() me.forge.RescanRepos() // looks for new dirs, checks existing repos for changes @@ -73,6 +51,7 @@ func main() { log.Printf("forge failure on Init err=(%v)\n", err) me.argv.BadExit("WTF", err) } + ENV.PrintTable() if me.forge.IsModeUnknown() || me.forge.IsModeNewUser() { doNewUser() |