fixes to default tablev0.1.13

1 files changed, 29 insertions, 25 deletions

diff --git a/tableRepos.go b/tableRepos.go
index f478287..8112409 100644
--- a/tableRepos.go
+++ b/tableRepos.go
@@ -19,7 +19,17 @@ func isPackageOnMirrors(repo *gitpb.Repo) bool {
 	return false
 }
 
-func printRepos(pb *gitpb.Repos) {
+func debianFilename(repo *gitpb.Repo) string {
+	manufactured := repo.GetCurrentVersion()
+	ver := trimNonNumericFromStart(manufactured)
+	name := me.forge.Config.DebName(repo.GetGoPath())
+	if actualp := me.machine.FindByVersion(name, ver); actualp != nil {
+		return actualp.PkgName
+	}
+	return "hmm"
+}
+
+func printPackagingTable(pb *gitpb.Repos) {
 	tablePB := pb.NewTable("deb details")
 	tablePB.NewUuid()
 
@@ -36,22 +46,24 @@ func printRepos(pb *gitpb.Repos) {
 	col = tablePB.AddStringFunc("Build Version", func(r *gitpb.Repo) string {
 		return me.forge.GetPackageVersion(r)
 	})
-	col.Width = 24
+	col.Width = 12
 
-	col = tablePB.AddStringFunc("is old", func(r *gitpb.Repo) string {
-		manufactured := r.GetCurrentVersion()
-		ver := trimNonNumericFromStart(manufactured)
-		name := me.forge.Config.DebName(r.GetGoPath())
-		if actualp := me.machine.FindByVersion(name, ver); actualp != nil {
-			// end += " (version match) " + actualp.Version + " " + ver + " "
+	/*
+		col = tablePB.AddStringFunc("is old", func(r *gitpb.Repo) string {
+			manufactured := r.GetCurrentVersion()
+			ver := trimNonNumericFromStart(manufactured)
+			name := me.forge.Config.DebName(r.GetGoPath())
+			if actualp := me.machine.FindByVersion(name, ver); actualp != nil {
+				// end += " (version match) " + actualp.Version + " " + ver + " "
+				return ""
+			}
+			if installedPackage := me.machine.FindInstalledByName(name); installedPackage != nil {
+				return installedPackage.Version
+			}
 			return ""
-		}
-		if installedPackage := me.machine.FindInstalledByName(name); installedPackage != nil {
-			return installedPackage.Version
-		}
-		return ""
-	})
-	col.Width = 10
+		})
+		col.Width = 10
+	*/
 
 	col = tablePB.AddStringFunc("I", func(r *gitpb.Repo) string {
 		name := me.forge.Config.DebName(r.GetNamespace())
@@ -82,19 +94,11 @@ func printRepos(pb *gitpb.Repos) {
 	})
 	col.Width = 5
 
-	col = tablePB.AddStringFunc("deb name", func(r *gitpb.Repo) string {
-		name := me.forge.Config.DebName(r.GetNamespace())
-		ver := me.forge.GetPackageVersion(r)
-		debname := name + "_" + ver + "_amd64.deb"
-		return debname
-	})
-	col.Width = 32
-
 	col = tablePB.AddState()
 	col.Width = 32
 
-	col = tablePB.AddStringFunc("end", func(r *gitpb.Repo) string {
-		return getStatusEnd(r)
+	col = tablePB.AddStringFunc("deb name", func(r *gitpb.Repo) string {
+		return debianFilename(r)
 	})
 	col.Width = -1