Clean-up.

basc/main.go

@@ -172,6 +172,21 @@ func gofmt(output string) error {
 	return cmd.Run()
 }
 
+func gomodinit(dir string) error {
+	_, err := os.Stat("go.mod")
+	if err == nil {
+		log.Printf("%s: build: go.mod exists in dir: %s", me, dir)
+		return nil
+	}
+
+	cmdModInit := exec.Command("go", "mod", "init", dir)
+	cmdModInit.Stdin = os.Stdin
+	cmdModInit.Stdout = os.Stdout
+	cmdModInit.Stderr = os.Stderr
+
+	return cmdModInit.Run()
+}
+
 func buildGo(dir, baslibModule string, getFlags []string, output string) error {
 	log.Printf("%s: build: dir=%s baslibModule=%s output=%s", me, dir, baslibModule, output)
 	log.Printf("%s: build: entering dir=%s", me, dir)
@@ -184,19 +199,19 @@ func buildGo(dir, baslibModule string, getFlags []string, output string) error {
 		return errChdir
 	}
 
-	_, err := os.Stat("go.mod")
-	if os.IsNotExist(err) {
-		cmdModInit := exec.Command("go", "mod", "init", dir)
-		cmdModInit.Stdin = os.Stdin
-		cmdModInit.Stdout = os.Stdout
-		cmdModInit.Stderr = os.Stderr
-		if errModInit := cmdModInit.Run(); errModInit != nil {
-			return errModInit
-		}
-	} else {
-		log.Printf("%s: build: go.mod exists", me)
+	//
+	// go mod init dir
+	//
+
+	errModInit := gomodinit(dir)
+	if errModInit != nil {
+		return errModInit
 	}
 
+	//
+	// go get baslibModule
+	//
+
 	args := []string{"get"}
 	args = append(args, getFlags...)
 	args = append(args, baslibModule)
@@ -209,6 +224,10 @@ func buildGo(dir, baslibModule string, getFlags []string, output string) error {
 		return errGet
 	}
 
+	//
+	// go build
+	//
+
 	args = []string{"build"}
 
 	if output != "" {