diff options
Diffstat (limited to 'init.go')
| -rw-r--r-- | init.go | 40 |
1 files changed, 22 insertions, 18 deletions
@@ -6,12 +6,10 @@ import ( "os" "os/user" "path/filepath" - "strings" "time" "go.wit.com/lib/gui/shell" "go.wit.com/lib/protobuf/gitpb" - "go.wit.com/lib/protobuf/zoopb" "go.wit.com/log" ) @@ -21,10 +19,12 @@ import ( func Init() *Forge { f := InitPB() - f.Machine = new(zoopb.Machine) - if err := f.Machine.ConfigLoad(); err != nil { - log.Log(WARN, "zoopb.ConfigLoad() failed", err) - } + /* + f.Machine = new(zoopb.Machine) + if err := f.Machine.ConfigLoad(); err != nil { + log.Log(WARN, "zoopb.ConfigLoad() failed", err) + } + */ if f.Config.Username == "" { usr, _ := user.Current() f.Config.Username = usr.Username @@ -40,7 +40,7 @@ func Init() *Forge { f.SetConfigSave(true) } - f.Machine.InitWit() + // f.Machine.InitWit() if f.hasFullScan { // duplicate time checking below. which one to keep? @@ -135,24 +135,28 @@ func (f *Forge) InitPB() { } func (f *Forge) InitMachine() { - f.Machine = new(zoopb.Machine) - if err := f.Machine.ConfigLoad(); err != nil { - log.Log(WARN, "zoopb.ConfigLoad() failed", err) - f.Machine.InitWit() - } + /* + f.Machine = new(zoopb.Machine) + if err := f.Machine.ConfigLoad(); err != nil { + log.Log(WARN, "zoopb.ConfigLoad() failed", err) + f.Machine.InitWit() + } + */ if f.Config.Username == "" { usr, _ := user.Current() f.Config.Username = usr.Username } - if f.Machine.Hostname == "" { - r, err := shell.RunVerbose([]string{"hostname", "-f"}) - if err == nil { - tmp := strings.Join(r.Stdout, "\n") - f.Machine.Hostname = strings.TrimSpace(tmp) + /* + if f.Machine.Hostname == "" { + r, err := shell.RunVerbose([]string{"hostname", "-f"}) + if err == nil { + tmp := strings.Join(r.Stdout, "\n") + f.Machine.Hostname = strings.TrimSpace(tmp) + } } - } + */ } // only init's the protobuf. intended to not scan or change anything |