fix(core): error with rsync v3.2.3 and later on certain OSes

garden-service/src/build-dir.ts

@@ -22,7 +22,7 @@ import { Profile } from "./util/profiling"
 import { syncWithOptions } from "./util/sync"
 
 const minRsyncVersion = "3.1.0"
-const versionRegex = /rsync  version ([\d\.]+)  /
+const versionRegex = /rsync  version [v]*([\d\.]+)  /
 
 // FIXME: We don't want to keep special casing this module type so we need to think
 // of a better way around this.

garden-service/test/data/dummy-rsync/min-version/rsync

@@ -0,0 +1,14 @@
+#!/bin/sh
+
+echo "rsync  version 3.1.0  protocol version 31
+Copyright (C) 1996-2018 by Andrew Tridgell, Wayne Davison, and others.
+Web site: http://rsync.samba.org/
+Capabilities:
+    64-bit files, 64-bit inums, 64-bit timestamps, 64-bit long ints,
+    socketpairs, hardlinks, symlinks, IPv6, batchfiles, inplace,
+    append, ACLs, xattrs, iconv, symtimes, no prealloc, file-flags
+
+rsync comes with ABSOLUTELY NO WARRANTY.  This is free software, and you
+are welcome to redistribute it under certain conditions.  See the GNU
+General Public Licence for details.
+"

garden-service/test/data/dummy-rsync/new-version/rsync

@@ -1,6 +1,7 @@
 #!/bin/sh
 
-echo "rsync  version 3.1.3  protocol version 31
+# Note: version 3.2.3 adds a "v" prefix on the version string
+echo "rsync  version v3.2.3  protocol version 31
 Copyright (C) 1996-2018 by Andrew Tridgell, Wayne Davison, and others.
 Web site: http://rsync.samba.org/
 Capabilities:

garden-service/test/unit/src/build-dir.ts

@@ -76,6 +76,28 @@ describe("BuildDir", () => {
     }
   })
 
+  it("should work with rsync v3.1.0", async () => {
+    const orgPath = process.env.PATH
+
+    try {
+      process.env.PATH = getDataDir("dummy-rsync", "min-version")
+      await BuildDir.factory(garden.projectRoot, garden.gardenDirPath)
+    } finally {
+      process.env.PATH = orgPath
+    }
+  })
+
+  it("should work with rsync v3.2.3", async () => {
+    const orgPath = process.env.PATH
+
+    try {
+      process.env.PATH = getDataDir("dummy-rsync", "new-version")
+      await BuildDir.factory(garden.projectRoot, garden.gardenDirPath)
+    } finally {
+      process.env.PATH = orgPath
+    }
+  })
+
   it("should throw if rsync is too old", async () => {
     const orgPath = process.env.PATH