more cleanupsv0.1.18

3 files changed, 5 insertions, 52 deletions

diff --git a/doUpgrade.go b/doUpgrade.go
index 8dece7c..5c644db 100644
--- a/doUpgrade.go
+++ b/doUpgrade.go
@@ -24,12 +24,7 @@ func doPackageList(all bool) {
 			installed.Append(p)
 		}
 	}
-	installed.PrintTable()
-	log.Info("aptly repo -remove-files -force-replace add wit /home/aptly/incoming/autogenpb_0.5.16_amd64.deb")
-	log.Info("aptly repo remove wit basicwindow")
-	log.Info("aptly snapshot create wit-v0.8.3 from repo wit")
-	log.Info("aptly publish snapshot wit-v0.8.3")
-	log.Info("aptly -dry-run repo remove wit protoc-gen-go # remote a file")
+	me.machine.PrintTable(installed)
 }
 
 func doUpgrade() error {
diff --git a/main.go b/main.go
index 7d5b9f9..a69973a 100644
--- a/main.go
+++ b/main.go
@@ -4,15 +4,11 @@
 package main
 
 import (
-	"debug/buildinfo"
 	"embed"
-	"fmt"
 	"os"
-	"path/filepath"
 	"unicode"
 
-	"go.wit.com/dev/davecgh/spew"
-	"go.wit.com/log"
+	"go.wit.com/lib/gui/prep"
 )
 
 // sent via -ldflags
@@ -27,7 +23,9 @@ var resources embed.FS
 
 func main() {
 	me = new(mainType)
-	me.once.Do(initMain)
+	// autocomplete must be processed before there is anything sent to STDOUT or STDERR
+	me.sh = prep.Bash3(&argv)        // add support for bash autocomplete with go-arg
+	me.homedir, _ = os.UserHomeDir() // store shortcut here todo: add better logic
 
 	if argv.Upgrade != nil {
 		doUpgrade()
@@ -89,32 +87,3 @@ func trimNonNumericFromStart(s string) string {
 	}
 	return ""
 }
-
-func dumpDebug() {
-	// Get absolute path of the currently running binary
-	exePath, err := os.Executable()
-	if err != nil {
-		fmt.Println("Error getting executable path:", err)
-		return
-	}
-
-	// Resolve symlinks if necessary
-	exePath, err = filepath.EvalSymlinks(exePath)
-	if err != nil {
-		fmt.Println("Error resolving symlink:", err)
-		return
-	}
-
-	// Read build info
-	bi, err := buildinfo.ReadFile(exePath)
-	if err != nil {
-		fmt.Println("Error reading build info:", err)
-		return
-	}
-
-	log.Infof("%s built with Go version: %s\n", exePath, bi.GoVersion)
-	spew.Dump(bi)
-	for _, dep := range bi.Deps {
-		fmt.Printf("Dependency: %s %s\n", dep.Path, dep.Version)
-	}
-}
diff --git a/structs.go b/structs.go
index 2f07955..9b3da7b 100644
--- a/structs.go
+++ b/structs.go
@@ -4,9 +4,7 @@
 package main
 
 import (
-	"os"
 	"sync"
-	"time"
 
 	"go.wit.com/lib/gui/prep"
 	"go.wit.com/lib/protobuf/forgepb"
@@ -18,7 +16,6 @@ var me *mainType
 // this app's variables
 type mainType struct {
 	once    sync.Once      // one-time initialized data
-	start   time.Time      // what the app starts (used for timing automated runs)
 	sh      *prep.Auto     // more experiments for bash handling
 	forge   *forgepb.Forge // your customized repo preferences and settings
 	machine *zoopb.Machine // your customized repo preferences and settings
@@ -38,11 +35,3 @@ func initMachine() {
 		me.machine, _ = zoopb.InitMachine()
 	}
 }
-
-func initMain() {
-	// autocomplete must be processed before there is anything sent to STDOUT or STDERR
-	me.sh = prep.Bash3(&argv)        // add support for bash autocomplete with go-arg
-	me.homedir, _ = os.UserHomeDir() // store shortcut here todo: add better logic
-	me.start = time.Now()
-	dumpDebug() // tinkering
-}