Update local, remote version checks to avoid blanks.

stephenwithav · stephenwithav · commit 223551b6791a · 2020-07-02T09:34:29.000-04:00
diff --git a/cmd/coder/sync.go b/cmd/coder/sync.go
@@ -1,8 +1,7 @@
 package main
 
 import (
-	"bufio"
-	"errors"
+	"bytes"
 	"fmt"
 	"log"
 	"os"
@@ -34,32 +33,18 @@ func (cmd *syncCmd) RegisterFlags(fl *pflag.FlagSet) {
 	fl.BoolVarP(&cmd.init, "init", "i", false, "do initial transfer and exit")
 }
 
-// See https://lxadm.com/Rsync_exit_codes#List_of_standard_rsync_exit_codes.
-var IncompatRsync = errors.New("rsync: exit status 2")
-var StreamErrRsync = errors.New("rsync: exit status 12")
-
 // Returns local rsync protocol version as a string.
-func (s *syncCmd) version() string {
+func version() string {
 	cmd := exec.Command("rsync", "--version")
-	stdout, err := cmd.StdoutPipe()
+	out, err := cmd.CombinedOutput()
 	if err != nil {
 		log.Fatal(err)
 	}
 
-	if err := cmd.Start(); err != nil {
-		log.Fatal(err)
-	}
-
-	r := bufio.NewReader(stdout)
-	if err := cmd.Wait(); err != nil {
-		log.Fatal(err)
-	}
-
-	firstLine, err := r.ReadString('\n')
+	firstLine, err := bytes.NewBuffer(out).ReadString('\n')
 	if err != nil {
-		return ""
+		log.Fatal(err)
 	}
-
 	versionString := strings.Split(firstLine, "protocol version ")
 
 	return versionString[1]
diff --git a/internal/sync/sync.go b/internal/sync/sync.go
@@ -1,7 +1,7 @@
 package sync
 
 import (
-	"bufio"
+	"bytes"
 	"context"
 	"errors"
 	"fmt"
@@ -283,7 +283,8 @@ func (s Sync) Version() (string, error) {
 	if err != nil {
 		return "", err
 	}
-	r := bufio.NewReader(process.Stdout())
+	buf := &bytes.Buffer{}
+	go io.Copy(buf, process.Stdout())
 
 	err = process.Wait()
 	if code, ok := err.(wsep.ExitError); ok {
@@ -293,7 +294,7 @@ func (s Sync) Version() (string, error) {
 		return "", fmt.Errorf("Server version mismatch")
 	}
 
-	firstLine, err := r.ReadString('\n')
+	firstLine, err := buf.ReadString('\n')
 	if err != nil {
 		return "", err
 	}
