use zoopb protobufs

1 files changed, 13 insertions, 44 deletions

diff --git a/main.go b/main.go
index 7734a58..db3e42a 100644
--- a/main.go
+++ b/main.go
@@ -16,11 +16,11 @@ package main
 
 import (
 	"embed"
-	"fmt"
 	"os"
 	"time"
 
 	"go.wit.com/dev/alexflint/arg"
+	"go.wit.com/lib/protobuf/zoopb"
 	"go.wit.com/log"
 )
 
@@ -39,53 +39,22 @@ func main() {
 		os.Exit(0)
 	}
 
-	me = new(stuff)
-	me.Zookeeper = "zookeeper.wit.com"
-	me.Hostname, _ = os.Hostname()
-	me.pollDelay = 3 * time.Second
-
-	log.DaemonMode(true)
-
-	installedPackages, err := getInstalledPackages()
-	if err != nil {
-		fmt.Println("Error:", err)
-		return
-	}
-
-	log.Info("debian has", len(installedPackages), "installed")
-	/*
-	// Print the installed packages and their versions
-	for pkg, version := range installedPackages {
-		fmt.Printf("%s: %s\n", pkg, version)
+	if argv.Daemon {
+		// turn off timestamps for STDOUT (systemd adds them)
+		log.DaemonMode(true)
 	}
-	*/
 
-	// Detect the Linux distribution
-	distro := detectDistro()
-	if distro == "" {
-		fmt.Println("Unable to detect Linux distribution.")
-		return
-	}
-
-	fmt.Printf("Detected distribution: %s\n", distro)
+	me = new(stuff)
+	me.zookeeper = "zookeeper.wit.com"
+	me.hostname, _ = os.Hostname()
+	me.pollDelay = 3 * time.Second
 
-	// Get the list of installed packages for the detected distro
-	packages, err := getPackageList(distro)
-	if err != nil {
-		fmt.Println("Error:", err)
-		return
-	}
+	// what OS?
+	me.distro = initDistro()
 
-	/*
-	// Print the installed packages
-	fmt.Println("Installed Packages:")
-	for _, pkg := range packages {
-		if pkg != "" {
-			fmt.Println(pkg)
-		}
-	}
-	*/
-	log.Info(distro, "has", len(packages), "installed")
+	// init the installed package list
+	me.packages = new(zoopb.Packages)
+	initPackages()
 
 	go NewWatchdog()