Merge branch 'master' into reuse-ssh-connection

Author: deansheather

README.md

@@ -36,6 +36,11 @@ We currently support:
 - MacOS
 - WSL
 
+For the remote server, we currently only support Linux `x86_64` (64-bit)
+servers with `glibc`. `musl` libc (which is most notably used by Alpine Linux)
+is currently not supported on the remote server:
+[#122](https://github.com/cdr/sshcode/issues/122).
+
 ## Usage
 
 ```bash

main.go

@@ -55,7 +55,7 @@ func (c *rootCmd) RegisterFlags(fl *flag.FlagSet) {
 	fl.BoolVar(&c.syncBack, "b", false, "sync extensions back on termination")
 	fl.BoolVar(&c.printVersion, "version", false, "print version information and exit")
 	fl.BoolVar(&c.noReuseConnection, "no-reuse-connection", false, "do not reuse SSH connection via control socket")
-	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")
 }
 

sshcode.go

@@ -210,8 +210,8 @@ func expandPath(path string) string {
 }
 
 func parseBindAddr(bindAddr string) (string, error) {
-	if bindAddr == "" {
-		bindAddr = ":"
+	if !strings.Contains(bindAddr, ":") {
+		bindAddr += ":"
 	}
 
 	host, port, err := net.SplitHostPort(bindAddr)
@@ -481,6 +481,7 @@ func downloadScript(codeServerPath string) string {
 	return fmt.Sprintf(
 		`set -euxo pipefail || exit 1
 
+[ "$(uname -m)" != "x86_64" ] && echo "Unsupported server architecture $(uname -m). code-server only has releases for x86_64 systems." && exit 1
 pkill -f %v || true
 mkdir -p ~/.local/share/code-server %v
 cd %v