projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '16141-gosdk-missing-fields'
[arvados.git]
/
lib
/
cli
/
external.go
diff --git
a/lib/cli/external.go
b/lib/cli/external.go
index 35933f99fc2afafdb970cc2127587f182364f094..626ef7d1a3c5d4bf2bed96d4a8e33892cdba0b7b 100644
(file)
--- a/
lib/cli/external.go
+++ b/
lib/cli/external.go
@@
-12,7
+12,7
@@
import (
"strings"
"syscall"
"strings"
"syscall"
- "git.
curoverse.com
/arvados.git/lib/cmd"
+ "git.
arvados.org
/arvados.git/lib/cmd"
)
var (
)
var (
@@
-22,7
+22,6
@@
var (
Copy = externalCmd{"arv-copy"}
Tag = externalCmd{"arv-tag"}
Ws = externalCmd{"arv-ws"}
Copy = externalCmd{"arv-copy"}
Tag = externalCmd{"arv-tag"}
Ws = externalCmd{"arv-ws"}
- Run = externalCmd{"arv-run"}
Keep = cmd.Multi(map[string]cmd.Handler{
"get": externalCmd{"arv-get"},
Keep = cmd.Multi(map[string]cmd.Handler{
"get": externalCmd{"arv-get"},
@@
-31,9
+30,6
@@
var (
"normalize": externalCmd{"arv-normalize"},
"docker": externalCmd{"arv-keepdocker"},
})
"normalize": externalCmd{"arv-normalize"},
"docker": externalCmd{"arv-keepdocker"},
})
- Pipeline = cmd.Multi(map[string]cmd.Handler{
- "run": externalCmd{"arv-run-pipeline-instance"},
- })
// user, group, container, specimen, etc.
APICall = apiCallCmd{}
)
// user, group, container, specimen, etc.
APICall = apiCallCmd{}
)
@@
-94,7
+90,7
@@
func (ec externalCmd) RunCommand(prog string, args []string, stdin io.Reader, st
return 1
case *exec.Error:
fmt.Fprintln(stderr, err)
return 1
case *exec.Error:
fmt.Fprintln(stderr, err)
- if ec.prog == "arv"
|| ec.prog == "arv-run-pipeline-instance"
{
+ if ec.prog == "arv" {
fmt.Fprint(stderr, rubyInstallHints)
} else if strings.HasPrefix(ec.prog, "arv-") {
fmt.Fprint(stderr, pythonInstallHints)
fmt.Fprint(stderr, rubyInstallHints)
} else if strings.HasPrefix(ec.prog, "arv-") {
fmt.Fprint(stderr, pythonInstallHints)