isolate Save() to a single place

1 files changed, 24 insertions, 26 deletions

diff --git a/doConfig.go b/doConfig.go
index bca2061..777ee09 100644
--- a/doConfig.go
+++ b/doConfig.go
@@ -4,24 +4,22 @@
 package main
 
 import (
-	"os"
-
 	"go.wit.com/lib/protobuf/forgepb"
 	"go.wit.com/log"
 )
 
-func doConfig() {
-	cfg := argv.Dev.Config
-	if cfg.Delete != "" {
-		me.forge.DeleteByGoPath(cfg.Delete)
+func doConfig() (string, error) {
+	argcfg := argv.Config
+	if argcfg.Delete != "" {
+		me.forge.DeleteByGoPath(argcfg.Delete)
 		me.forge.SetConfigSave(true)
 		okExit("")
 	}
 
 	/*
-		if cfg.Register != "" {
-			if err := doRegister(cfg.Register); err == nil {
-				okExit("attempting to register " + cfg.Register)
+		if argcfg.Register != "" {
+			if err := doRegister(argcfg.Register); err == nil {
+				okExit("attempting to register " + argcfg.Register)
 			} else {
 				badExit(err)
 			}
@@ -29,30 +27,30 @@ func doConfig() {
 	*/
 
 	// try to add, then save config and exit
-	if cfg.Add != nil {
-		log.Info("going to add a new repo", cfg.Add.Namespace)
-		deleteGoPath(me.forge, cfg.Add.Namespace)
+	if argcfg.Add != nil {
+		log.Info("going to add a new repo", argcfg.Add.Namespace)
+		deleteGoPath(me.forge, argcfg.Add.Namespace)
 		new1 := forgepb.ForgeConfig{
-			Namespace:        cfg.Add.Namespace,
-			GoPath:           cfg.Add.Namespace,
-			Writable:         cfg.Add.Writable,
-			ReadOnly:         cfg.Add.ReadOnly,
-			Private:          cfg.Add.Private,
-			Directory:        cfg.Add.Directory,
-			Favorite:         cfg.Add.Favorite,
-			Interesting:      cfg.Add.Interesting,
-			MasterBranchName: cfg.Add.Master,
-			DevelBranchName:  cfg.Add.Devel,
-			UserBranchName:   cfg.Add.User,
+			Namespace:        argcfg.Add.Namespace,
+			GoPath:           argcfg.Add.Namespace,
+			Writable:         argcfg.Add.Writable,
+			ReadOnly:         argcfg.Add.ReadOnly,
+			Private:          argcfg.Add.Private,
+			Directory:        argcfg.Add.Directory,
+			Favorite:         argcfg.Add.Favorite,
+			Interesting:      argcfg.Add.Interesting,
+			MasterBranchName: argcfg.Add.Master,
+			DevelBranchName:  argcfg.Add.Devel,
+			UserBranchName:   argcfg.Add.User,
 		}
 
 		me.forge.Config.Append(&new1)
-		me.forge.ConfigSave()
-		os.Exit(0)
+		me.forge.Save()
+		return "added", nil
 	}
 
 	footer := me.forge.Config.PrintTable()
-	okExit(footer)
+	return footer, nil
 }
 
 func deleteGoPath(f *forgepb.Forge, gopath string) bool {