diff options
Diffstat (limited to 'doNewUser.go')
| -rw-r--r-- | doNewUser.go | 28 |
1 files changed, 13 insertions, 15 deletions
diff --git a/doNewUser.go b/doNewUser.go index 55a9b7c..6cb359b 100644 --- a/doNewUser.go +++ b/doNewUser.go @@ -6,8 +6,6 @@ package main // An app to submit patches for the 30 GO GUI repos import ( - "fmt" - "go.wit.com/lib/fhelp" "go.wit.com/lib/gui/shell" "go.wit.com/lib/protobuf/forgepb" @@ -18,16 +16,16 @@ func doNewUser() (string, error) { var s string var err error + if me.forge.Config.Mode == forgepb.ForgeMode_NORMAL { + // not new user + return s, err + } if me.forge.Config.Mode == forgepb.ForgeMode_UNKNOWN { dumpDebug() log.Info("---- ----") log.Info("---- Welcome to forge!!! ----") log.Info("---- ----") // this should never happen - log.Info("You are a new user and we never introduced ourselves") - if fhelp.QuestionUser("forge will scan ~/go/src for git repos") { - log.Info("continue") - } if err := me.forge.SetMode(forgepb.ForgeMode_NEWUSER); err != nil { log.Info("early forge new user handling failed", err) return "forge is still new and under development", err @@ -36,7 +34,14 @@ func doNewUser() (string, error) { // log.Info("MODE NOT UNKNOWN") } + if me.forge.Config.ReposPB == "" { + log.Info("broken config. load default config here") + me.forge.Config, err = forgepb.MakeDefaultConfig() + } + if shell.Exists(me.forge.Config.ReposPB) { + log.Info("looks like you might not be a new user") + log.Info("a repos file already exists at", me.forge.Config.ReposPB) // not a new user return s, err } @@ -45,15 +50,6 @@ func doNewUser() (string, error) { pfile, _ := resources.ReadFile("resources/NEWUSER") log.Info("") log.Info(string(pfile)) - s = fmt.Sprintf("Initialize forge?") - if fhelp.QuestionUser(s) { - } else { - me.sh.GoodExit("no? porque?") - } - if fhelp.QuestionUser("forge will not look for git repos in ~/go/src") { - } else { - me.sh.GoodExit("no? porque?") - } me.forge.ScanRepoDir() // looks for new dirs, checks existing repos for changes if me.forge.Config.Mode == forgepb.ForgeMode_NEWUSER { @@ -74,6 +70,8 @@ func doNewUser() (string, error) { err := me.forge.ConfigSave() if err != nil { log.Info("ConfigSave() failed", err) + } else { + log.Info("ConfigSave() worked filename =", me.forge.Config.Filename) } } me.sh.GoodExit("try running: 'forge rebuild forge' to test out that forge is working on your machine") |