diff --git a/src/cmd/linuxkit/push.go b/src/cmd/linuxkit/push.go index f7295bdfe..83e9d9e49 100644 --- a/src/cmd/linuxkit/push.go +++ b/src/cmd/linuxkit/push.go @@ -11,13 +11,13 @@ import ( func pushUsage() { invoked := filepath.Base(os.Args[0]) fmt.Printf("USAGE: %s push [backend] [options] [prefix]\n\n", invoked) - fmt.Printf("'backend' specifies the push backend.\n") fmt.Printf("Supported backends are\n") + // Please keep these in alphabetical order + fmt.Printf(" aws\n") + fmt.Printf(" azure\n") fmt.Printf(" gcp\n") fmt.Printf(" vcenter\n") - fmt.Printf(" azure\n") - fmt.Printf(" aws\n") fmt.Printf("\n") fmt.Printf("'options' are the backend specific options.\n") fmt.Printf("See '%s push [backend] --help' for details.\n\n", invoked) @@ -31,17 +31,18 @@ func push(args []string) { } switch args[0] { + // Please keep cases in alphabetical order + case "aws": + pushAWS(args[1:]) + case "azure": + pushAzure(args[1:]) + case "gcp": + pushGcp(args[1:]) case "help", "-h", "-help", "--help": pushUsage() os.Exit(0) - case "gcp": - pushGcp(args[1:]) case "vcenter": pushVCenter(args[1:]) - case "azure": - pushAzure(args[1:]) - case "aws": - pushAWS(args[1:]) default: log.Errorf("No 'push' backend specified.") } diff --git a/src/cmd/linuxkit/run.go b/src/cmd/linuxkit/run.go index 21a9325a9..11636ba78 100644 --- a/src/cmd/linuxkit/run.go +++ b/src/cmd/linuxkit/run.go @@ -16,14 +16,15 @@ func runUsage() { fmt.Printf("'backend' specifies the run backend.\n") fmt.Printf("If not specified the platform specific default will be used\n") fmt.Printf("Supported backends are (default platform in brackets):\n") + // Please keep these in alphabetical order fmt.Printf(" aws\n") fmt.Printf(" azure\n") fmt.Printf(" gcp\n") fmt.Printf(" hyperkit [macOS]\n") + fmt.Printf(" packet\n") fmt.Printf(" qemu [linux]\n") fmt.Printf(" vcenter\n") fmt.Printf(" vmware\n") - fmt.Printf(" packet\n") fmt.Printf("\n") fmt.Printf("'options' are the backend specific options.\n") fmt.Printf("See '%s run [backend] --help' for details.\n\n", invoked) @@ -38,23 +39,24 @@ func run(args []string) { } switch args[0] { + // Please keep cases in alphabetical order + case "aws": + runAWS(args[1:]) + case "azure": + runAzure(args[1:]) + case "gcp": + runGcp(args[1:]) case "help", "-h", "-help", "--help": runUsage() os.Exit(0) - case "aws": - runAWS(args[1:]) case "hyperkit": runHyperKit(args[1:]) - case "azure": - runAzure(args[1:]) - case "vmware": - runVMware(args[1:]) - case "gcp": - runGcp(args[1:]) - case "qemu": - runQemu(args[1:]) case "packet": runPacket(args[1:]) + case "qemu": + runQemu(args[1:]) + case "vmware": + runVMware(args[1:]) case "vcenter": runVcenter(args[1:]) default: