From a28318fbcb3aad0681c7e0f72a35cafc049750d9 Mon Sep 17 00:00:00 2001
From: Jeff Carr <jcarr@wit.com>
Date: Thu, 25 Sep 2025 15:03:12 -0500
Subject: [PATCH] argv autocomplete improvements

---
 argv.go         | 4 ++--
 doAptUpgrade.go | 6 +++++-
 doWITCOM.go     | 5 ++---
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/argv.go b/argv.go
index d71e315..0fec5b4 100644
--- a/argv.go
+++ b/argv.go
@@ -27,7 +27,7 @@ type args struct {
 	ListPkgs    *EmptyCmd   `arg:"subcommand:list"               help:"list all the packages on mirrors.wit.com"`
 	Test        *EmptyCmd   `arg:"subcommand:test"               help:"test build everything first"`
 	Clone       *EmptyCmd   `arg:"subcommand:repomap-clone"      help:"go-clone from a gowebd repomap"`
-	Upgrade     *EmptyCmd   `arg:"subcommand:upgrade"            help:"apt upgrade packages installed from mirrors.wit.com"`
+	Upgrade     *DefaultCmd `arg:"subcommand:upgrade"            help:"apt upgrade packages installed from mirrors.wit.com"`
 	RepoMap     string      `arg:"--repomap"                     help:"location of the repomap"`
 	Release     bool        `arg:"--release"                     help:"use go-deb --release"`
 	DryRun      bool        `arg:"--dry-run"                     help:"only show what would be packaged"`
@@ -86,7 +86,7 @@ func (args) Appname() string {
 
 func (a args) DoAutoComplete(pb *prep.Auto) {
 	if pb.Cmd == "" {
-		pb.Autocomplete3([]string{"--bash", "build", "debian", "install", "macos"})
+		pb.Autocomplete3([]string{"--bash", "build", "debian", "install", "upgrade", "macos", "--witcom"})
 	} else {
 		pb.SubCommand(pb.Argv...)
 	}
diff --git a/doAptUpgrade.go b/doAptUpgrade.go
index 6f995e1..ae0a248 100644
--- a/doAptUpgrade.go
+++ b/doAptUpgrade.go
@@ -25,7 +25,11 @@ func doAptUpgrade() {
 	loop := me.machine.Wit.SortByName()
 	for loop.Scan() {
 		p := loop.Next()
-		// log.Info("apt install", name)
+		// log.Info("apt install", p.Name)
+		if p.Name == "" {
+			log.Info("something wrong. p.Name was blank", p)
+			continue
+		}
 		if me.machine.IsInstalled(p.Name) {
 			cmd := []string{"apt", "install", p.Name}
 			if argv.DryRun {
diff --git a/doWITCOM.go b/doWITCOM.go
index c68408a..ecfa409 100644
--- a/doWITCOM.go
+++ b/doWITCOM.go
@@ -28,8 +28,6 @@ func doWITCOM() {
 }
 
 // add a common header for WIT files
-// add a common header for WIT files
-
 func addCommonHeader(filename string) error {
 	// read in the .proto file
 	data, err := os.ReadFile(filename)
@@ -66,7 +64,8 @@ func addCommonHeader(filename string) error {
 		// print the header once
 		if !done {
 			newfile += fmt.Sprintln("// Copyright 2017-2025 WIT.COM Inc. All rights reserved.")
-			newfile += fmt.Sprintln("// Use of this source code is governed by the GPL 3.0")
+			// todo, verify LICENSE file is GPL 3.0 here
+			newfile += fmt.Sprintln("// Use of this source code is governed by the GPL")
 			newfile += fmt.Sprintln("")
 			done = true
 		}