X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/7f2569f2e9900348dc76b495c9a416fe339593ae..1923ceda3c8845526f1ddcdd6275513760e0cd84:/lib/cloud/cloudtest/cmd.go

diff --git a/lib/cloud/cloudtest/cmd.go b/lib/cloud/cloudtest/cmd.go
index 9c3fc46c0c..0ec79e1175 100644
--- a/lib/cloud/cloudtest/cmd.go
+++ b/lib/cloud/cloudtest/cmd.go
@@ -12,11 +12,12 @@ import (
 	"io"
 	"os"
 
-	"git.curoverse.com/arvados.git/lib/cloud"
-	"git.curoverse.com/arvados.git/lib/config"
-	"git.curoverse.com/arvados.git/lib/dispatchcloud"
-	"git.curoverse.com/arvados.git/sdk/go/arvados"
-	"git.curoverse.com/arvados.git/sdk/go/ctxlog"
+	"git.arvados.org/arvados.git/lib/cloud"
+	"git.arvados.org/arvados.git/lib/cmd"
+	"git.arvados.org/arvados.git/lib/config"
+	"git.arvados.org/arvados.git/lib/dispatchcloud"
+	"git.arvados.org/arvados.git/sdk/go/arvados"
+	"git.arvados.org/arvados.git/sdk/go/ctxlog"
 	"golang.org/x/crypto/ssh"
 )
 
@@ -41,17 +42,8 @@ func (command) RunCommand(prog string, args []string, stdin io.Reader, stdout, s
 	destroyExisting := flags.Bool("destroy-existing", false, "Destroy any existing instances tagged with our InstanceSetID, instead of erroring out")
 	shellCommand := flags.String("command", "", "Run an interactive shell command on the test instance when it boots")
 	pauseBeforeDestroy := flags.Bool("pause-before-destroy", false, "Prompt and wait before destroying the test instance")
-	err = flags.Parse(args)
-	if err == flag.ErrHelp {
-		err = nil
-		return 0
-	} else if err != nil {
-		return 2
-	}
-
-	if len(flags.Args()) != 0 {
-		flags.Usage()
-		return 2
+	if ok, code := cmd.ParseFlags(flags, prog, args, "", stderr); !ok {
+		return code
 	}
 	logger := ctxlog.New(stderr, "text", "info")
 	defer func() {