diff options
Diffstat (limited to 'main.go')
| -rw-r--r-- | main.go | 21 |
1 files changed, 14 insertions, 7 deletions
@@ -15,6 +15,7 @@ import ( "go.wit.com/lib/gui/shell" "go.wit.com/lib/protobuf/forgepb" "go.wit.com/lib/protobuf/gitpb" + "go.wit.com/lib/protobuf/zoopb" "go.wit.com/log" ) @@ -47,6 +48,12 @@ func main() { // load the ~/.config/forge/ config me.forge = forgepb.Init() + me.machine = new(zoopb.Machine) + if err := me.machine.ConfigLoad(); err != nil { + log.Info("zoopb.ConfigLoad() failed", err) + } + me.machine.InitWit() + me.myGui = gui.New() me.myGui.Default() @@ -71,7 +78,7 @@ func main() { log.DaemonMode(true) defer log.DaemonMode(false) fmt.Println("Installed Packages:") - loop := me.forge.Machine.Wit.SortByName() + loop := me.machine.Wit.SortByName() for loop.Scan() { p := loop.Next() var end string @@ -79,12 +86,12 @@ func main() { if me.forge.Config.IsPrivate(p.Name) { end += "(private) " } - if actualp := me.forge.Machine.FindVersion(p.Name, p.Version); actualp != nil { + if actualp := me.machine.FindVersion(p.Name, p.Version); actualp != nil { // end += "(version match) " } else { end += "(version mismatch) " + actualp.Version + " " + version + " " } - if actualp := me.forge.Machine.FindInstalledByName(p.Name); actualp != nil { + if actualp := me.machine.FindInstalledByName(p.Name); actualp != nil { if p.Version != actualp.Version { end += "(installed " + actualp.Version + " vs " + p.Version + ") " } else { @@ -163,10 +170,10 @@ func main() { ver := trimNonNumericFromStart(manufactured) name := me.forge.Config.DebName(check.GetGoPath()) var realver string - if installedPackage := me.forge.Machine.FindInstalledByName(name); installedPackage != nil { + if installedPackage := me.machine.FindInstalledByName(name); installedPackage != nil { realver = installedPackage.Version } - if actualp := me.forge.Machine.FindVersion(name, ver); actualp != nil { + if actualp := me.machine.FindVersion(name, ver); actualp != nil { end += " (version match) " + actualp.Version + " " + ver + " " state[check] = "on mirrors" } else { @@ -175,8 +182,8 @@ func main() { } // end += "" + ver + " " } - if me.forge.Machine.IsInstalled(name) { - if actualp := me.forge.Machine.FindInstalledByName(name); actualp != nil { + if me.machine.IsInstalled(name) { + if actualp := me.machine.FindInstalledByName(name); actualp != nil { if ver != actualp.Version { end += "(installed " + actualp.Version + ") " } else { |