more robust mbsync check, close #956

1 files changed, 8 insertions, 7 deletions

diff --git a/bin/mw b/bin/mw
index 7884960..5698f09 100755
--- a/bin/mw
+++ b/bin/mw
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 set -a
 
@@ -31,14 +31,15 @@ maxmes="0"
 
 alias mbsync='mbsync -c "$mbsyncrc"'
 
-# mbsync now requires "Far/Near" rather than "Master/Slave", but Ubuntu/Debian
-# have the older version.
-if command -V apt-get >/dev/null 2>&1; then
-	master="Master"
-	slave="Slave"
-else
+# mbsync >=1.4.0 requires "Far/Near" rather than "Master/Slave."
+mbver="$(mbsync -v)"
+mbver="${mbver#* }"
+if [ "${mbver%.*}" >= 1.4 ]; then
 	master="Far"
 	slave="Near"
+else
+	master="Master"
+	slave="Slave"
 fi
 
 for x in "/etc/ssl/certs/ca-certificates.crt" \