16298: "arvados-server killcollection" command.

[arvados.git] / lib / cmd / cmd.go

diff --git a/lib/cmd/cmd.go b/lib/cmd/cmd.go
index 51bcf55c76040e1f8c3a1320fcf7ab50db2090c6..611c95d2340a3b2da47b8a7cbcfff2a3aad9af8c 100644 (file)
--- a/lib/cmd/cmd.go
+++ b/lib/cmd/cmd.go
@@ -65,6 +65,11 @@ type Multi map[string]Handler
 
 func (m Multi) RunCommand(prog string, args []string, stdin io.Reader, stdout, stderr io.Writer) int {
        _, basename := filepath.Split(prog)
+       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"