Merge pull request #119 from cdr/improve-bind-flag-doc

deansheather · web-flow · commit 8c07a080220b · 2019-06-27T06:26:34.000Z
Update --bind flag help text
diff --git a/main.go b/main.go
@@ -53,7 +53,7 @@ func (c *rootCmd) RegisterFlags(fl *flag.FlagSet) {
 	fl.BoolVar(&c.skipSync, "skipsync", false, "skip syncing local settings and extensions to remote host")
 	fl.BoolVar(&c.syncBack, "b", false, "sync extensions back on termination")
 	fl.BoolVar(&c.printVersion, "version", false, "print version information and exit")
-	fl.StringVar(&c.bindAddr, "bind", "", "local bind address for ssh tunnel")
+	fl.StringVar(&c.bindAddr, "bind", "", "local bind address for SSH tunnel, in [HOST][:PORT] syntax (default: 127.0.0.1)")
 	fl.StringVar(&c.sshFlags, "ssh-flags", "", "custom SSH flags")
 }
 
diff --git a/sshcode.go b/sshcode.go
@@ -168,8 +168,8 @@ func sshCode(host, dir string, o options) error {
 }
 
 func parseBindAddr(bindAddr string) (string, error) {
-	if bindAddr == "" {
-		bindAddr = ":"
+	if !strings.Contains(bindAddr, ":") {
+		bindAddr += ":"
 	}
 
 	host, port, err := net.SplitHostPort(bindAddr)

Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ func (c rootCmd) RegisterFlags(fl flag.FlagSet) {`
`53`	`53`	`fl.BoolVar(&c.skipSync, "skipsync", false, "skip syncing local settings and extensions to remote host")`
`54`	`54`	`fl.BoolVar(&c.syncBack, "b", false, "sync extensions back on termination")`
`55`	`55`	`fl.BoolVar(&c.printVersion, "version", false, "print version information and exit")`
`56`		`- fl.StringVar(&c.bindAddr, "bind", "", "local bind address for ssh tunnel")`
	`56`	`+ fl.StringVar(&c.bindAddr, "bind", "", "local bind address for SSH tunnel, in [HOST][:PORT] syntax (default: 127.0.0.1)")`
`57`	`57`	`fl.StringVar(&c.sshFlags, "ssh-flags", "", "custom SSH flags")`
`58`	`58`	`}`
`59`	`59`
Original file line number	Diff line number	Diff line change
`@@ -168,8 +168,8 @@ func sshCode(host, dir string, o options) error {`
`168`	`168`	`}`
`169`	`169`
`170`	`170`	`func parseBindAddr(bindAddr string) (string, error) {`
`171`		`- if bindAddr == "" {`
`172`		`- bindAddr = ":"`
	`171`	`+ if !strings.Contains(bindAddr, ":") {`
	`172`	`+ bindAddr += ":"`
`173`	`173`	`}`
`174`	`174`
`175`	`175`	`host, port, err := net.SplitHostPort(bindAddr)`