From 3f5a24dc8c0ac4ef22e994cef0a9aabffa57bf82 Mon Sep 17 00:00:00 2001
From: Jeff Carr <jcarr@wit.com>
Date: Thu, 9 Oct 2025 13:33:15 -0500
Subject: new .proto file

---
 apt.go      |  4 ++--
 machine.go  | 16 ++++++++--------
 watchdog.go |  2 +-
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/apt.go b/apt.go
index 89406f2..2954d3b 100644
--- a/apt.go
+++ b/apt.go
@@ -22,7 +22,7 @@ func initPackages() {
 	// Print the installed packages and their versions
 	for pkg, version := range newP {
 		new1 := new(zoopb.Package)
-		new1.Name = pkg
+		new1.Package = pkg
 		new1.Version = version
 		me.packages.Append(new1)
 	}
@@ -32,7 +32,7 @@ func initPackages() {
 
 func addNew(name string, version string) {
 	new1 := new(zoopb.Package)
-	new1.Name = name
+	new1.Package = name
 	new1.Version = version
 	me.packages.Append(new1)
 }
diff --git a/machine.go b/machine.go
index 7504f21..669c927 100644
--- a/machine.go
+++ b/machine.go
@@ -110,7 +110,7 @@ func updateMachine(u *zoopb.Machine) string {
 	if u.Packages == nil {
 		u.Packages = new(zoopb.Packages)
 	}
-	if zood := m.Packages.FindByName("zood"); zood != nil {
+	if zood := m.Packages.FindByPackage("zood"); zood != nil {
 		log.Log(INFO, m.Hostname, "has zood version", zood.Version)
 	}
 	m.Laststamp = timestamppb.New(time.Now())
@@ -128,20 +128,20 @@ func updateMachine(u *zoopb.Machine) string {
 func updatePackages(m *zoopb.Machine, newp *zoopb.Packages) bool {
 	var changed bool = false
 
-	loop := newp.SortByName()
+	loop := newp.SortByPackage()
 	for loop.Scan() {
 		p := loop.Next()
-		if p.Name == "zood" {
+		if p.Package == "zood" {
 			if updatePackageVersion(m, p) {
 				changed = true
 			}
 		}
-		if p.Name == "virtigod" {
+		if p.Package == "virtigod" {
 			if updatePackageVersion(m, p) {
 				changed = true
 			}
 		}
-		if p.Name == "forge" {
+		if p.Package == "forge" {
 			if updatePackageVersion(m, p) {
 				changed = true
 			}
@@ -151,9 +151,9 @@ func updatePackages(m *zoopb.Machine, newp *zoopb.Packages) bool {
 }
 
 func updatePackageVersion(m *zoopb.Machine, pnew *zoopb.Package) bool {
-	pold := m.Packages.FindByName(pnew.Name)
+	pold := m.Packages.FindByPackage(pnew.Package)
 	if pold == nil {
-		log.Log(NOW, "updatePackages() new package", pnew.Name, "version", pnew.Version, "machine", m.Hostname)
+		log.Log(NOW, "updatePackages() new package", pnew.Package, "version", pnew.Version, "machine", m.Hostname)
 		m.Packages.Append(pnew)
 		return true
 	}
@@ -161,7 +161,7 @@ func updatePackageVersion(m *zoopb.Machine, pnew *zoopb.Package) bool {
 		log.Log(ZOOD, "updatePackages() unchanged", pold.Version, "machine", m.Hostname)
 		return false
 	}
-	log.Log(NOW, "updatePackages() package", pnew.Name, "version changed", pold.Version, "to", pnew.Version, "machine", m.Hostname)
+	log.Log(NOW, "updatePackages() package", pnew.Package, "version changed", pold.Version, "to", pnew.Version, "machine", m.Hostname)
 	pold.Version = pnew.Version
 	return true
 }
diff --git a/watchdog.go b/watchdog.go
index 1235abc..cb3359d 100644
--- a/watchdog.go
+++ b/watchdog.go
@@ -48,7 +48,7 @@ func NewWatchdog() {
 			for loop.Scan() {
 				m := loop.Next()
 				counter += 1
-				zood := m.Packages.FindByName("zood")
+				zood := m.Packages.FindByPackage("zood")
 				if zood == nil {
 					log.Info("machine", m.Hostname, "does not have zood installed")
 				} else {
-- 
cgit v1.2.3