docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix usage of flag parsing terminator 

There is no need to check for "--" manually.  cli will do this for us.

Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
This commit is contained in:
Nathan LeClaire 2015-02-02 12:10:56 -08:00
parent 25b45ffc7d
commit 22eae1296d
1 changed files with 6 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
commands.go
View File

@ -403,6 +403,10 @@ func cmdEnv(c *cli.Context) {
} }
func cmdSsh(c *cli.Context) { func cmdSsh(c *cli.Context) {
var (
err error
sshCmd *exec.Cmd
)
name := c.Args().First() name := c.Args().First()
store := NewStore(c.GlobalString("storage-path"), c.GlobalString("tls-ca-cert"), c.GlobalString("tls-ca-key")) store := NewStore(c.GlobalString("storage-path"), c.GlobalString("tls-ca-cert"), c.GlobalString("tls-ca-key"))
@ -415,28 +419,15 @@ func cmdSsh(c *cli.Context) {
name = host.Name name = host.Name
} }
var cmd string
var args []string = c.Args()
for i, arg := range args {
if arg == "--" {
i++
cmd = strings.Join(args[i:], " ")
break
}
}
host, err := store.Load(name) host, err := store.Load(name)
if err != nil { if err != nil {
log.Fatal(err) log.Fatal(err)
} }
var sshCmd *exec.Cmd if len(c.Args()) <= 1 {
if len(cmd) == 0 {
sshCmd, err = host.Driver.GetSSHCommand() sshCmd, err = host.Driver.GetSSHCommand()
} else { } else {
sshCmd, err = host.Driver.GetSSHCommand(cmd) sshCmd, err = host.Driver.GetSSHCommand(c.Args()[1:]...)
} }
if err != nil { if err != nil {
log.Fatal(err) log.Fatal(err)