From e6a332962833dadce26748bd3f2fc436a44b0200 Mon Sep 17 00:00:00 2001
From: Jeff Carr <jcarr@wit.com>
Date: Thu, 9 Jan 2025 05:06:11 -0600
Subject: [PATCH] rearrange the code

---
 main.go | 40 ++++++++++++++++++++--------------------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/main.go b/main.go
index 8e8aa09..c242ffd 100644
--- a/main.go
+++ b/main.go
@@ -117,26 +117,6 @@ func main() {
 		os.Exit(-1)
 	}
 
-	// this should be garbage soon
-	sortmap = make(map[string]string)
-	sortmap["package"] = packageName
-	sortmap["protofile"] = argv.Proto
-	sortmap["protobase"] = protobase
-	if argv.LoBase == "" {
-		// if not set, assumed to be protobase
-		sortmap["base"] = protobase
-	} else {
-		sortmap["base"] = argv.LoBase
-	}
-	sortmap["lock"] = sortmap["base"] + "sMu" // is nonglobal and plural
-	if argv.UpBase == "" {
-		sortmap["Base"] = cases.Title(language.English, cases.NoLower).String(protobase)
-		sortmap["Bases"] = sortmap["Base"] + "s"
-	} else {
-		sortmap["Base"] = argv.UpBase
-		sortmap["Bases"] = sortmap["Base"] + "s"
-	}
-
 	if argv.DryRun {
 		os.Exit(0)
 	}
@@ -166,6 +146,26 @@ func main() {
 
 	pb.marshal(f)
 
+	// this should be garbage soon
+	sortmap = make(map[string]string)
+	sortmap["package"] = packageName
+	sortmap["protofile"] = argv.Proto
+	sortmap["protobase"] = protobase
+	if argv.LoBase == "" {
+		// if not set, assumed to be protobase
+		sortmap["base"] = protobase
+	} else {
+		sortmap["base"] = argv.LoBase
+	}
+	sortmap["lock"] = sortmap["base"] + "sMu" // is nonglobal and plural
+	if argv.UpBase == "" {
+		sortmap["Base"] = cases.Title(language.English, cases.NoLower).String(protobase)
+		sortmap["Bases"] = sortmap["Base"] + "s"
+	} else {
+		sortmap["Base"] = argv.UpBase
+		sortmap["Bases"] = sortmap["Base"] + "s"
+	}
+
 	// pb.makeSortfile(f)
 }