X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/9fa635c9dc288317f19471291accecf8690f5718..c9e9f6ff4cadaf30657becdb70d0d828965397b0:/lib/cmd/cmd.go

diff --git a/lib/cmd/cmd.go b/lib/cmd/cmd.go
index 353167e800..611c95d234 100644
--- a/lib/cmd/cmd.go
+++ b/lib/cmd/cmd.go
@@ -28,16 +28,28 @@ func (f HandlerFunc) RunCommand(prog string, args []string, stdin io.Reader, std
 	return f(prog, args, stdin, stdout, stderr)
 }
 
-type Version string
+// Version is a Handler that prints the package version (set at build
+// time using -ldflags) and Go runtime version to stdout, and returns
+// 0.
+var Version versionCommand
 
-func (v Version) RunCommand(prog string, args []string, stdin io.Reader, stdout, stderr io.Writer) int {
+var version = "dev"
+
+type versionCommand struct{}
+
+func (versionCommand) String() string {
+	return fmt.Sprintf("%s (%s)", version, runtime.Version())
+}
+
+func (versionCommand) RunCommand(prog string, args []string, stdin io.Reader, stdout, stderr io.Writer) int {
 	prog = regexp.MustCompile(` -*version$`).ReplaceAllLiteralString(prog, "")
-	fmt.Fprintf(stdout, "%s %s (%s)\n", prog, v, runtime.Version())
+	fmt.Fprintf(stdout, "%s %s (%s)\n", prog, version, runtime.Version())
 	return 0
 }
 
-// Multi is a Handler that looks up its first argument in a map, and
-// invokes the resulting Handler with the remaining args.
+// Multi is a Handler that looks up its first argument in a map (after
+// stripping any "arvados-" or "crunch-" prefix), and invokes the
+// resulting Handler with the remaining args.
 //
 // Example:
 //
@@ -52,19 +64,27 @@ func (v Version) RunCommand(prog string, args []string, stdin io.Reader, stdout,
 type Multi map[string]Handler
 
 func (m Multi) RunCommand(prog string, args []string, stdin io.Reader, stdout, stderr io.Writer) int {
-	if len(args) < 1 {
-		fmt.Fprintf(stderr, "usage: %s command [args]\n", prog)
-		m.Usage(stderr)
-		return 2
-	}
 	_, basename := filepath.Split(prog)
-	if strings.HasPrefix(basename, "arvados-") {
-		basename = basename[8:]
-	} else if strings.HasPrefix(basename, "crunch-") {
-		basename = basename[7:]
+	if i := strings.Index(basename, "~"); i >= 0 {
+		// drop "~anything" suffix (arvados-dispatch-cloud's
+		// DeployRunnerBinary feature relies on this)
+		basename = basename[:i]
+	}
+	cmd, ok := m[basename]
+	if !ok {
+		// "controller" command exists, and binary is named "arvados-controller"
+		cmd, ok = m[strings.TrimPrefix(basename, "arvados-")]
+	}
+	if !ok {
+		// "dispatch-slurm" command exists, and binary is named "crunch-dispatch-slurm"
+		cmd, ok = m[strings.TrimPrefix(basename, "crunch-")]
 	}
-	if cmd, ok := m[basename]; ok {
+	if ok {
 		return cmd.RunCommand(prog, args, stdin, stdout, stderr)
+	} else if len(args) < 1 {
+		fmt.Fprintf(stderr, "usage: %s command [args]\n", prog)
+		m.Usage(stderr)
+		return 2
 	} else if cmd, ok = m[args[0]]; ok {
 		return cmd.RunCommand(prog+" "+args[0], args[1:], stdin, stdout, stderr)
 	} else {