diff options
Diffstat (limited to 'doNewUser.go')
| -rw-r--r-- | doNewUser.go | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/doNewUser.go b/doNewUser.go index b9fe56a..bba0a1e 100644 --- a/doNewUser.go +++ b/doNewUser.go @@ -7,7 +7,10 @@ package main import ( "errors" + "fmt" + "path/filepath" + "go.wit.com/lib/config" "go.wit.com/lib/fhelp" "go.wit.com/lib/protobuf/forgepb" "go.wit.com/log" @@ -17,21 +20,17 @@ func doNewUser() (string, error) { var s string var err error - if me.forge.Mode == forgepb.ForgeMode_UNKNOWN { + if me.forge.IsModeUnknown() { + // display banner. it's probably the first time forge was ever run on this machine dumpDebug() log.Info("---- ----") log.Info("---- Welcome to forge!!! ----") log.Info("---- ----") - if err := me.forge.SetMode(forgepb.ForgeMode_NEWUSER); err != nil { - // this should never happen - log.Info("early forge new user handling failed", err) - return "forge is still new and under development", err - } - } else { - // log.Info("MODE NOT UNKNOWN") + me.forge.SetModeNewUser() } - if me.forge.Mode != forgepb.ForgeMode_NEWUSER { + if !me.forge.IsModeNewUser() { + panic("finally got out of NEWUSER") // you aren't a new user anymore return s, err } @@ -41,8 +40,10 @@ func doNewUser() (string, error) { log.Info("") log.Info(string(pfile)) - if fhelp.QuestionUser("Scan ~/go/src for .git repos") { - me.forge.ScanRepoDir() // looks for new dirs, checks existing repos for changes + gosrc := filepath.Join(config.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 } else { // log.Info("question false") return "not scanned", errors.New("~/go/src not scanned") |