Sort listed command names

.circleci/config.yml

@@ -24,30 +24,8 @@ workflows:
     jobs:
       - clean-gopath
       - clean-gomod
-      - clean-makebb
 
 jobs:
-  clean-makebb:
-    <<: [*go122-template, *gomod-template]
-    steps:
-      - checkout
-      - run:
-          name: check generated code
-          command: |
-            mkdir -p /home/circleci/go/bin
-            go build ./src/cmd/embedvar
-            cp ./embedvar $GOPATH/bin
-            export PATH=$GOPATH/bin:$PATH
-            cd src/pkg/bb
-            go generate
-            git status
-            if [[ -n "$(git status --porcelain .)" ]]; then
-              echo 'Generated bbmain code is out of date. Run `go install ./src/cmd/embevar && cd src/pkg/bb && go generate` and then check changes in git.'
-              git status --porcelain .
-              git diff
-              exit 1
-            fi
-
   clean-gopath:
     <<: [*go122-template, *gopath-template]
     steps:

src/pkg/bb/bb.go

@@ -38,8 +38,16 @@ import (
 	"github.com/u-root/gobusybox/src/pkg/bb/findpkg"
 	"github.com/u-root/gobusybox/src/pkg/golang"
 	"github.com/u-root/uio/ulog"
+
+	_ "embed"
 )
 
+//go:embed bbmain/cmd/main.go
+var bbMainSource []byte
+
+//go:embed bbmain/register.go
+var bbRegisterSource []byte
+
 func checkDuplicate(cmds []*bbinternal.Package) error {
 	seen := make(map[string]string)
 	for _, cmd := range cmds {

src/pkg/bb/bbmain/register.go

@@ -10,6 +10,7 @@
 	"errors"
 	"fmt"
 	"os"
+	"sort"
 	// There MUST NOT be any other dependencies here.
 	//
 	// It is preferred to copy minimal code necessary into this file, as
@@ -28,6 +29,7 @@
 	for c := range bbCmds {
 		cmds = append(cmds, c)
 	}
+	sort.Strings(cmds)
 	return cmds
 }