Commit2f52cef

authored

Merge branch 'master' into proxy-support

2 parents5ea05eb +8c07a08 commit2f52cefCopy full SHA for 2f52cef

File tree

-3

lines changed

-3

lines changed

Lines changed: 5 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -36,6 +36,11 @@ We currently support:`
`36`	`36`	`- MacOS`
`37`	`37`	`- WSL`
`38`	`38`
	`39`	+For the remote server, we currently only support Linux`x86_64` (64-bit)
	`40`	+servers with`glibc`.`musl` libc (which is most notably used by Alpine Linux)
	`41`	`+is currently not supported on the remote server:`
	`42`	`+[#122](https://github.com/cdr/sshcode/issues/122).`
	`43`	`+`
`39`	`44`	`##Usage`
`40`	`45`
`41`	`46`	```bash

Lines changed: 1 addition & 1 deletion

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 forssh tunnel")`
	`56`	`+fl.StringVar(&c.bindAddr,"bind","","local bind address forSSH 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`

Lines changed: 3 additions & 2 deletions

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`	`funcparseBindAddr(bindAddrstring) (string,error) {`
`171`		`-ifbindAddr=="" {`
`172`		`-bindAddr=":"`
	`171`	`+if!strings.Contains(bindAddr,":") {`
	`172`	`+bindAddr+=":"`
`173`	`173`	`}`
`174`	`174`
`175`	`175`	`host,port,err:=net.SplitHostPort(bindAddr)`
`@@ -345,6 +345,7 @@ func downloadScript(codeServerPath string) string {`
`345`	`345`	`returnfmt.Sprintf(`
`346`	`346`	`set -euxo pipefail \|\| exit 1
`347`	`347`
	`348`	`+[ "$(uname -m)" != "x86_64" ] && echo "Unsupported server architecture $(uname -m). code-server only has releases for x86_64 systems." && exit 1`
`348`	`349`	`pkill -f %v \|\| true`
`349`	`350`	`mkdir -p ~/.local/share/code-server %v`
`350`	`351`	`cd %v`

Comments

(0)