Merge "move microfactory main.main() to microfactory.bash"

microfactory/microfactory.bash

@@ -51,6 +51,7 @@ function build_go
         local gen_src_dir="${BUILDDIR}/.microfactory_$(uname)_intermediates/src"
         mkdir -p "${gen_src_dir}"
         sed "s/^package microfactory/package main/" "${mf_src}/microfactory.go" >"${gen_src_dir}/microfactory.go"
+        printf "\n//for use with go run\nfunc main() { Main() }\n" >>"${gen_src_dir}/microfactory.go"
 
         mf_cmd="${GOROOT}/bin/go run ${gen_src_dir}/microfactory.go"
     else

microfactory/microfactory.go

@@ -617,8 +617,6 @@ func rebuildMicrofactory(config *Config, mybin string) bool {
 	return true
 }
 
-// microfactory.bash will make a copy of this file renamed into the main package for use with `go run`
-func main() { Main() }
 func Main() {
 	var output, mybin string
 	var config Config