new argv design

1 files changed, 9 insertions, 8 deletions

diff --git a/subCommand.go b/subCommand.go
index fd75fc2..33078f0 100644
--- a/subCommand.go
+++ b/subCommand.go
@@ -4,6 +4,7 @@
 package main
 
 import (
+	"go.wit.com/lib/protobuf/argvpb"
 	"go.wit.com/lib/protobuf/filepb"
 	"go.wit.com/log"
 )
@@ -15,7 +16,7 @@ func subCommand() (string, error) {
 
 	if argv.Upgrade != nil {
 		doUpgrade()
-		me.argv.GoodExit("")
+		argvpb.GoodExit("")
 	}
 
 	if argv.Linux != nil {
@@ -53,22 +54,22 @@ func subCommand() (string, error) {
 
 	if argv.Clone != nil {
 		doClone()
-		me.argv.GoodExit("")
+		argvpb.GoodExit("")
 	}
 
 	if argv.WITCOM {
 		doWITCOM()
-		me.argv.GoodExit("")
+		argvpb.GoodExit("")
 	}
 
 	if argv.Clone != nil {
 		doClone()
-		me.argv.GoodExit("")
+		argvpb.GoodExit("")
 	}
 
 	if argv.WITCOM {
 		doWITCOM()
-		me.argv.GoodExit("")
+		argvpb.GoodExit("")
 	}
 
 	if argv.Upgrade != nil {
@@ -81,16 +82,16 @@ func subCommand() (string, error) {
 
 	if argv.Publish != nil {
 		if err := doPublish(); err != nil {
-			me.argv.BadExit("doPublish failed", err)
+			argvpb.BadExit("doPublish failed", err)
 		}
-		me.argv.GoodExit("")
+		argvpb.GoodExit("")
 	}
 
 	if argv.Zoo != nil {
 		if areSuperuser() {
 			exitOnErrorRealtime([]string{"journalctl", "-n", "100", "-f", "_SYSTEMD_UNIT=zood.service"})
 		}
-		me.argv.GoodExit("do something here")
+		argvpb.GoodExit("do something here")
 	}
 	return s, err
 }